git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'devel-stable' into devel
[safe/jmp/linux-2.6]
/
arch
/
arm
/
mach-versatile
/
core.c
diff --git
a/arch/arm/mach-versatile/core.c
b/arch/arm/mach-versatile/core.c
index
afc0f87
..
975eae4
100644
(file)
--- a/
arch/arm/mach-versatile/core.c
+++ b/
arch/arm/mach-versatile/core.c
@@
-343,8
+343,7
@@
static struct platform_device versatile_i2c_device = {
static struct i2c_board_info versatile_i2c_board_info[] = {
{
- I2C_BOARD_INFO("rtc-ds1307", 0xd0 >> 1),
- .type = "ds1338",
+ I2C_BOARD_INFO("ds1338", 0xd0 >> 1),
},
};