aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/host
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2013-04-11 16:49:39 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-04-11 17:27:55 -0400
commitcccfc53626bb74f5b9fbacfdcd3c475f0e1f359b (patch)
treee67e36c8c9030a0a259bea187644e45aed4b7279 /drivers/usb/host
parent2871782ae1cbca372eabf599576d611d861310e6 (diff)
usb: exynos: do not include plat/usb-phy.h
The definitions have moved to include/linux/usb/samsung-usb-phy.h, and plat/usb-phy.h is unavailable from drivers in a multiplatform configuration. Also fix up the plat/usb-phy.h header file to use the definitions from the new header instead of providing a separate copy. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Cc: Alan Stern <stern@rowland.harvard.edu> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/host')
-rw-r--r--drivers/usb/host/ehci-s5p.c1
-rw-r--r--drivers/usb/host/ohci-exynos.c1
2 files changed, 0 insertions, 2 deletions
diff --git a/drivers/usb/host/ehci-s5p.c b/drivers/usb/host/ehci-s5p.c
index 580548ad8530..635775278c7f 100644
--- a/drivers/usb/host/ehci-s5p.c
+++ b/drivers/usb/host/ehci-s5p.c
@@ -23,7 +23,6 @@
23#include <linux/platform_data/usb-ehci-s5p.h> 23#include <linux/platform_data/usb-ehci-s5p.h>
24#include <linux/usb/phy.h> 24#include <linux/usb/phy.h>
25#include <linux/usb/samsung_usb_phy.h> 25#include <linux/usb/samsung_usb_phy.h>
26#include <plat/usb-phy.h>
27#include <linux/usb.h> 26#include <linux/usb.h>
28#include <linux/usb/hcd.h> 27#include <linux/usb/hcd.h>
29#include <linux/usb/otg.h> 28#include <linux/usb/otg.h>
diff --git a/drivers/usb/host/ohci-exynos.c b/drivers/usb/host/ohci-exynos.c
index 509fa515248c..114583a8e92b 100644
--- a/drivers/usb/host/ohci-exynos.c
+++ b/drivers/usb/host/ohci-exynos.c
@@ -17,7 +17,6 @@
17#include <linux/platform_data/usb-exynos.h> 17#include <linux/platform_data/usb-exynos.h>
18#include <linux/usb/phy.h> 18#include <linux/usb/phy.h>
19#include <linux/usb/samsung_usb_phy.h> 19#include <linux/usb/samsung_usb_phy.h>
20#include <plat/usb-phy.h>
21 20
22struct exynos_ohci_hcd { 21struct exynos_ohci_hcd {
23 struct device *dev; 22 struct device *dev;