projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branches 'pxa' and 'orion-fixes1'
[linux-2.6-block.git]
/
drivers
/
mfd
/
htc-pasic3.c
diff --git
a/drivers/mfd/htc-pasic3.c
b/drivers/mfd/htc-pasic3.c
index cb4ab27a2ef5a348e8c780a1c99ade1dce414c76..633cbba072f024f013a17f42cc8b3181c63ef8a4 100644
(file)
--- 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