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 branch 'for-next' of git://git.infradead.org/users/sameo/mfd-2.6
[linux-2.6-block.git]
/
arch
/
arm
/
mach-imx
/
mach-mx31lite.c
diff --git
a/arch/arm/mach-imx/mach-mx31lite.c
b/arch/arm/mach-imx/mach-mx31lite.c
index c97c26d814ed1640df98300a90dc281380734541..05f1c71ba409f77cc0032a5c14b9f2285d18d93a 100644
(file)
--- a/
arch/arm/mach-imx/mach-mx31lite.c
+++ b/
arch/arm/mach-imx/mach-mx31lite.c
@@
-112,8
+112,7
@@
static const struct spi_imx_master spi1_pdata __initconst = {
};
static struct mc13xxx_platform_data mc13783_pdata __initdata = {
- .flags = MC13XXX_USE_RTC |
- MC13XXX_USE_REGULATOR,
+ .flags = MC13XXX_USE_RTC,
};
static struct spi_board_info mc13783_spi_dev __initdata = {