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 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq
[pandora-kernel.git]
/
arch
/
arm
/
mach-ixp4xx
/
nas100d-setup.c
diff --git
a/arch/arm/mach-ixp4xx/nas100d-setup.c
b/arch/arm/mach-ixp4xx/nas100d-setup.c
index
159e1c4
..
84b5e62
100644
(file)
--- a/
arch/arm/mach-ixp4xx/nas100d-setup.c
+++ b/
arch/arm/mach-ixp4xx/nas100d-setup.c
@@
-54,7
+54,7
@@
static struct platform_device nas100d_flash = {
static struct i2c_board_info __initdata nas100d_i2c_board_info [] = {
{
- I2C_BOARD_INFO("
rtc-
pcf8563", 0x51),
+ I2C_BOARD_INFO("pcf8563", 0x51),
},
};