Merge branch 'fixes' of master.kernel.org:/home/rmk/linux-2.6-arm

* 'fixes' of master.kernel.org:/home/rmk/linux-2.6-arm:
  [ARM] fix 48d7927bdf
  [ARM] 5010/1: htc-pasic3: remove unused defines and includes
  [ARM] pxa: fix 0e623941be
  [ARM] fix lh7a40x/kev7a400 build
This commit is contained in:
Linus Torvalds
2008-04-24 08:36:11 -07:00
26 changed files with 32 additions and 24 deletions
-3
View File
@@ -19,8 +19,6 @@
#include <linux/interrupt.h>
#include <linux/mfd/htc-pasic3.h>
#include <asm/arch/pxa-regs.h>
struct pasic3_data {
void __iomem *mapping;
unsigned int bus_shift;
@@ -30,7 +28,6 @@ struct pasic3_data {
#define REG_ADDR 5
#define REG_DATA 6
#define NUM_REGS 7
#define READ_MODE 0x80