diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2010-01-19 04:36:09 -0500 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2010-01-19 04:36:09 -0500 |
| commit | 668dfc7527eb755e1bf194bf19c0c281e9df6deb (patch) | |
| tree | 2d9ba8e3ebbb7579f1af0493a9783f640ca86546 /arch/arm/mach-s3c2412/mach-jive.c | |
| parent | 9e157144afe81052f5abe122c2469e33a30d20a5 (diff) | |
| parent | 22c810ab3e25d16e6f128384d107b933b6fd8fff (diff) | |
ARM: Merge next-samsung-devupdates1
Merge branch 'next-samsung-devupdates1' into next-samsung-try7
Diffstat (limited to 'arch/arm/mach-s3c2412/mach-jive.c')
| -rw-r--r-- | arch/arm/mach-s3c2412/mach-jive.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-s3c2412/mach-jive.c b/arch/arm/mach-s3c2412/mach-jive.c index c9fa3fca486c..14f4798291aa 100644 --- a/arch/arm/mach-s3c2412/mach-jive.c +++ b/arch/arm/mach-s3c2412/mach-jive.c | |||
| @@ -468,7 +468,7 @@ static struct i2c_board_info jive_i2c_devs[] __initdata = { | |||
| 468 | /* The platform devices being used. */ | 468 | /* The platform devices being used. */ |
| 469 | 469 | ||
| 470 | static struct platform_device *jive_devices[] __initdata = { | 470 | static struct platform_device *jive_devices[] __initdata = { |
| 471 | &s3c_device_usb, | 471 | &s3c_device_ohci, |
| 472 | &s3c_device_rtc, | 472 | &s3c_device_rtc, |
| 473 | &s3c_device_wdt, | 473 | &s3c_device_wdt, |
| 474 | &s3c_device_i2c0, | 474 | &s3c_device_i2c0, |