diff options
| author | merge <null@invalid> | 2009-03-10 08:10:41 +0000 |
|---|---|---|
| committer | Andy Green <agreen@octopus.localdomain> | 2009-03-10 08:10:41 +0000 |
| commit | e8ee87681eb8a32f8a695053523e99ffcd5feb83 (patch) | |
| tree | c9c166207b464529d994949a95cf97f45641ea82 /arch/arm/mach-s3c6410 | |
| parent | 8771f76e8249627e82a3530ce3008116619e8284 (diff) | |
MERGE-andy-tracking-patchset-edits
Diffstat (limited to 'arch/arm/mach-s3c6410')
| -rw-r--r-- | arch/arm/mach-s3c6410/Kconfig | 1 | ||||
| -rw-r--r-- | arch/arm/mach-s3c6410/mach-smdk6410.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-s3c6410/Kconfig b/arch/arm/mach-s3c6410/Kconfig index 9fd6fb3cfb8..c90f8048e04 100644 --- a/arch/arm/mach-s3c6410/Kconfig +++ b/arch/arm/mach-s3c6410/Kconfig @@ -26,6 +26,7 @@ config MACH_SMDK6410 select S3C_DEV_HSMMC1 select S3C_DEV_I2C1 select S3C_DEV_FB + select S3C_DEV_USB_HOST select S3C6410_SETUP_SDHCI select S3C64XX_SETUP_I2C1 select S3C64XX_SETUP_FB_24BPP diff --git a/arch/arm/mach-s3c6410/mach-smdk6410.c b/arch/arm/mach-s3c6410/mach-smdk6410.c index deec6eb495a..d04c4c31765 100644 --- a/arch/arm/mach-s3c6410/mach-smdk6410.c +++ b/arch/arm/mach-s3c6410/mach-smdk6410.c @@ -147,6 +147,7 @@ static struct platform_device *smdk6410_devices[] __initdata = { &s3c_device_i2c0, &s3c_device_i2c1, &s3c_device_fb, + &s3c_device_usb, &smdk6410_lcd_powerdev, &s3c_device_usbgadget, |