aboutsummaryrefslogtreecommitdiff
path: root/drivers/mfd
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-04-24 08:36:11 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-04-24 08:36:11 -0700
commit8fa82790fb9dfe57aeafc8de6b6a5c1df63efa06 (patch)
treea5fd9796af13c084be5d6d5924c3c3430b1866b8 /drivers/mfd
parent2444e56b0c08e6f3e3877583841a1213e3263d98 (diff)
parent4a1fd556c1f1fbd6d9d6739efec042324732b697 (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.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/mfd/htc-pasic3.c b/drivers/mfd/htc-pasic3.c
index af66f4f2830..4edc120a635 100644
--- a/drivers/mfd/htc-pasic3.c
+++ b/drivers/mfd/htc-pasic3.c
@@ -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