diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-24 11:36:11 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-24 11:36:11 -0400 |
| commit | 8fa82790fb9dfe57aeafc8de6b6a5c1df63efa06 (patch) | |
| tree | a5fd9796af13c084be5d6d5924c3c3430b1866b8 /drivers/mfd | |
| parent | 2444e56b0c08e6f3e3877583841a1213e3263d98 (diff) | |
| parent | 4a1fd556c1f1fbd6d9d6739efec042324732b697 (diff) | |
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 48d7927bdf071d05cf5d15b816cf06b0937cb84f
[ARM] 5010/1: htc-pasic3: remove unused defines and includes
[ARM] pxa: fix 0e623941bec7e80c97b076d346327b31ae17d84a
[ARM] fix lh7a40x/kev7a400 build
Diffstat (limited to 'drivers/mfd')
| -rw-r--r-- | drivers/mfd/htc-pasic3.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/mfd/htc-pasic3.c b/drivers/mfd/htc-pasic3.c index af66f4f28300..4edc120a6359 100644 --- a/drivers/mfd/htc-pasic3.c +++ b/drivers/mfd/htc-pasic3.c | |||
| @@ -19,8 +19,6 @@ | |||
| 19 | #include <linux/interrupt.h> | 19 | #include <linux/interrupt.h> |
| 20 | #include <linux/mfd/htc-pasic3.h> | 20 | #include <linux/mfd/htc-pasic3.h> |
| 21 | 21 | ||
| 22 | #include <asm/arch/pxa-regs.h> | ||
| 23 | |||
| 24 | struct pasic3_data { | 22 | struct pasic3_data { |
| 25 | void __iomem *mapping; | 23 | void __iomem *mapping; |
| 26 | unsigned int bus_shift; | 24 | unsigned int bus_shift; |
| @@ -30,7 +28,6 @@ struct pasic3_data { | |||
| 30 | 28 | ||
| 31 | #define REG_ADDR 5 | 29 | #define REG_ADDR 5 |
| 32 | #define REG_DATA 6 | 30 | #define REG_DATA 6 |
| 33 | #define NUM_REGS 7 | ||
| 34 | 31 | ||
| 35 | #define READ_MODE 0x80 | 32 | #define READ_MODE 0x80 |
| 36 | 33 | ||