diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2010-01-19 09:36:09 (GMT) |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2010-01-19 09:36:09 (GMT) |
| commit | 668dfc7527eb755e1bf194bf19c0c281e9df6deb (patch) | |
| tree | 2d9ba8e3ebbb7579f1af0493a9783f640ca86546 /arch/arm/mach-s3c2410/mach-qt2410.c | |
| parent | 9e157144afe81052f5abe122c2469e33a30d20a5 (diff) | |
| parent | 22c810ab3e25d16e6f128384d107b933b6fd8fff (diff) | |
| download | linux-fsl-qoriq-668dfc7527eb755e1bf194bf19c0c281e9df6deb.tar.xz | |
ARM: Merge next-samsung-devupdates1
Merge branch 'next-samsung-devupdates1' into next-samsung-try7
Diffstat (limited to 'arch/arm/mach-s3c2410/mach-qt2410.c')
| -rw-r--r-- | arch/arm/mach-s3c2410/mach-qt2410.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-s3c2410/mach-qt2410.c b/arch/arm/mach-s3c2410/mach-qt2410.c index ab092bc..92a4ec3 100644 --- a/arch/arm/mach-s3c2410/mach-qt2410.c +++ b/arch/arm/mach-s3c2410/mach-qt2410.c @@ -246,7 +246,7 @@ static struct platform_device qt2410_spi = { /* Board devices */ static struct platform_device *qt2410_devices[] __initdata = { - &s3c_device_usb, + &s3c_device_ohci, &s3c_device_lcd, &s3c_device_wdt, &s3c_device_i2c0, |