diff --git a/[refs] b/[refs] index 149479ef5eb1..ed12b31e89d8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f0e1fa760099eef43f4450471d795807a1cc43c8 +refs/heads/master: 06fa1d37ce9a8fab86a5db304ca5b576f0223d18 diff --git a/trunk/arch/arm/mach-s3c6410/Kconfig b/trunk/arch/arm/mach-s3c6410/Kconfig index 9c163f365c80..e63aac7f4e5a 100644 --- a/trunk/arch/arm/mach-s3c6410/Kconfig +++ b/trunk/arch/arm/mach-s3c6410/Kconfig @@ -36,6 +36,7 @@ config MACH_SMDK6410 select S3C_DEV_I2C1 select S3C_DEV_FB select S3C_DEV_USB_HOST + select S3C_DEV_USB_HSOTG select S3C6410_SETUP_SDHCI select S3C64XX_SETUP_I2C1 select S3C64XX_SETUP_FB_24BPP diff --git a/trunk/arch/arm/mach-s3c6410/mach-smdk6410.c b/trunk/arch/arm/mach-s3c6410/mach-smdk6410.c index 8fd7632735df..bc9a7dea567f 100644 --- a/trunk/arch/arm/mach-s3c6410/mach-smdk6410.c +++ b/trunk/arch/arm/mach-s3c6410/mach-smdk6410.c @@ -183,6 +183,7 @@ static struct platform_device *smdk6410_devices[] __initdata = { &s3c_device_i2c1, &s3c_device_fb, &s3c_device_usb, + &s3c_device_usb_hsotg, &smdk6410_lcd_powerdev, &smdk6410_smsc911x,