diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2013-04-09 15:31:57 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2013-04-09 15:31:57 +0200 |
| commit | 4909e13cd9d864f95f63d2d16489778fff483460 (patch) | |
| tree | 2e6693a64f3955e40fcc92b674be3ec20753eb15 /drivers/usb | |
| parent | 92202876a3cc6b7fb0bbb52a5059e02c2c2e2186 (diff) | |
| parent | fe72e27368265a99f6a0a189a5d593aac320a59d (diff) | |
| download | op-kernel-dev-4909e13cd9d864f95f63d2d16489778fff483460.zip op-kernel-dev-4909e13cd9d864f95f63d2d16489778fff483460.tar.gz | |
Merge tag 'cleanup-samsung-for-v3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/cleanup
From Kukjin Kim <kgene.kim@samsung.com>:
cleanup unused codes for samsung
* tag 'cleanup-samsung-for-v3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
ARM: EXYNOS: remove "config EXYNOS_DEV_DRM"
ARM: EXYNOS: change the name of USB ohci header
ARM: SAMSUNG: Remove unnecessary code for dma
ARM: S3C24XX: Remove unused GPIO drive strength register definitions
ARM: S3C24XX: Removed unneeded dependency on CPU_S3C2412
ARM: S3C24XX: Removed unneeded dependency on CPU_S3C2410
ARM: S3C24XX: Removed unneeded dependency on ARCH_S3C24XX for boards
ARM: SAMSUNG: Fix typo "CONFIG_SAMSUNG_DEV_RTC"
ARM: S5P64X0: Fix typo "CONFIG_S5P64X0_SETUP_SDHCI"
ARM: S3C64XX: remove obsolete Makefile line
ARM: S3C24XX: remove unneeded "config SMDK2440_CPU2442"
ARM: SAMSUNG: Remove useless Samsung GPIO related CONFIG
ARM: SAMSUNG: remove "config S3C_BOOT_WATCHDOG"
ARM: EXYNOS: change HAVE_SAMSUNG_KEYPAD to KEYBOARD_SAMSUNG
ARM: EXYNOS: remove duplicated include from common.c
ARM: EXYNOS: drop "select HAVE_SCHED_CLOCK"
ARM: S3C24XX: drop "select MACH_NEO1973"
ARM: S3C24XX: drop "select MACH_N35"
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'drivers/usb')
| -rw-r--r-- | drivers/usb/host/ohci-exynos.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/usb/host/ohci-exynos.c b/drivers/usb/host/ohci-exynos.c index e3b7e85..0bd6f47 100644 --- a/drivers/usb/host/ohci-exynos.c +++ b/drivers/usb/host/ohci-exynos.c @@ -14,9 +14,10 @@ #include <linux/clk.h> #include <linux/of.h> #include <linux/platform_device.h> -#include <linux/platform_data/usb-exynos.h> +#include <linux/platform_data/usb-ohci-exynos.h> #include <linux/usb/phy.h> #include <linux/usb/samsung_usb_phy.h> + #include <plat/usb-phy.h> struct exynos_ohci_hcd { |
