git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-next' of git://git.infradead.org/users/sameo/mfd-2.6
[pandora-kernel.git]
/
arch
/
arm
/
mach-imx
/
mach-mx27_3ds.c
diff --git
a/arch/arm/mach-imx/mach-mx27_3ds.c
b/arch/arm/mach-imx/mach-mx27_3ds.c
index
cfa8417
..
ba232d7
100644
(file)
--- a/
arch/arm/mach-imx/mach-mx27_3ds.c
+++ b/
arch/arm/mach-imx/mach-mx27_3ds.c
@@
-293,8
+293,7
@@
static struct mc13xxx_platform_data mc13783_pdata = {
.num_regulators = ARRAY_SIZE(mx27_3ds_regulators),
},
- .flags = MC13783_USE_REGULATOR | MC13783_USE_TOUCHSCREEN |
- MC13783_USE_RTC,
+ .flags = MC13XXX_USE_TOUCHSCREEN | MC13XXX_USE_RTC,
};
/* SPI */