diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2010-01-19 10:36:09 +0100 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2010-01-19 10:36:09 +0100 |
| commit | 668dfc7527eb755e1bf194bf19c0c281e9df6deb (patch) | |
| tree | 2d9ba8e3ebbb7579f1af0493a9783f640ca86546 /arch/arm/mach-s3c6410/mach-smdk6410.c | |
| parent | ARM: Merge next-jassi-spi (diff) | |
| parent | ARM: S3C24XX: Add mci platform data set call s3c24xx_mci_set_platdata(). (diff) | |
| download | linux-668dfc7527eb755e1bf194bf19c0c281e9df6deb.tar.xz linux-668dfc7527eb755e1bf194bf19c0c281e9df6deb.zip | |
ARM: Merge next-samsung-devupdates1
Merge branch 'next-samsung-devupdates1' into next-samsung-try7
Diffstat (limited to 'arch/arm/mach-s3c6410/mach-smdk6410.c')
| -rw-r--r-- | arch/arm/mach-s3c6410/mach-smdk6410.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-s3c6410/mach-smdk6410.c b/arch/arm/mach-s3c6410/mach-smdk6410.c index eb5de981c094..5376880cdd89 100644 --- a/arch/arm/mach-s3c6410/mach-smdk6410.c +++ b/arch/arm/mach-s3c6410/mach-smdk6410.c @@ -246,7 +246,7 @@ static struct platform_device *smdk6410_devices[] __initdata = { &s3c_device_i2c0, &s3c_device_i2c1, &s3c_device_fb, - &s3c_device_usb, + &s3c_device_ohci, &s3c_device_usb_hsotg, #ifdef CONFIG_REGULATOR |