diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-09-12 07:02:26 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-12 07:02:26 -0400 |
| commit | ddd559b13f6d2fe3ad68c4b3f5235fd3c2eae4e3 (patch) | |
| tree | d827bca3fc825a0ac33efbcd493713be40fcc812 /arch/arm/mach-versatile | |
| parent | cf7a2b4fb6a9b86779930a0a123b0df41aa9208f (diff) | |
| parent | f17a1f06d2fa93f4825be572622eb02c4894db4e (diff) | |
Merge branch 'devel-stable' into devel
Conflicts:
MAINTAINERS
arch/arm/mm/fault.c
Diffstat (limited to 'arch/arm/mach-versatile')
| -rw-r--r-- | arch/arm/mach-versatile/core.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mach-versatile/core.c b/arch/arm/mach-versatile/core.c index afc0f87f3fa4..975eae41ee66 100644 --- 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 = { | |||
| 343 | 343 | ||
| 344 | static struct i2c_board_info versatile_i2c_board_info[] = { | 344 | static struct i2c_board_info versatile_i2c_board_info[] = { |
| 345 | { | 345 | { |
| 346 | I2C_BOARD_INFO("rtc-ds1307", 0xd0 >> 1), | 346 | I2C_BOARD_INFO("ds1338", 0xd0 >> 1), |
| 347 | .type = "ds1338", | ||
| 348 | }, | 347 | }, |
| 349 | }; | 348 | }; |
| 350 | 349 | ||