diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-09-21 10:23:44 +0100 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-11-16 11:35:30 +0000 |
commit | 46000065a631c6d21452d533baf086175c384ba4 (patch) | |
tree | 064b6b85282820e8669a6b5df86869f4989f34b8 | |
parent | 6920b5a791bbb54810159fbf6acf2c6ae14cdd22 (diff) |
ARM: move udc_pxa2xx.h to linux/platform_data
Move the PXA2xx/IXP4xx UDC header file into linux/platform_data as it
only contains a driver platform data structure.
Acked-by: Felipe Balbi <balbi@ti.com>
Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Acked-by: Krzysztof Halasa <khc@pm.waw.pl>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
-rw-r--r-- | arch/arm/mach-ixp4xx/include/mach/udc.h | 2 | ||||
-rw-r--r-- | arch/arm/mach-pxa/include/mach/udc.h | 2 | ||||
-rw-r--r-- | drivers/usb/gadget/pxa25x_udc.c | 4 | ||||
-rw-r--r-- | include/linux/platform_data/pxa2xx_udc.h (renamed from arch/arm/include/asm/mach/udc_pxa2xx.h) | 5 |
4 files changed, 6 insertions, 7 deletions
diff --git a/arch/arm/mach-ixp4xx/include/mach/udc.h b/arch/arm/mach-ixp4xx/include/mach/udc.h index 80d6da2eafa..7bd8b96c884 100644 --- a/arch/arm/mach-ixp4xx/include/mach/udc.h +++ b/arch/arm/mach-ixp4xx/include/mach/udc.h @@ -2,7 +2,7 @@ * arch/arm/mach-ixp4xx/include/mach/udc.h * */ -#include <asm/mach/udc_pxa2xx.h> +#include <linux/platform_data/pxa2xx_udc.h> extern void ixp4xx_set_udc_info(struct pxa2xx_udc_mach_info *info); diff --git a/arch/arm/mach-pxa/include/mach/udc.h b/arch/arm/mach-pxa/include/mach/udc.h index 2f82332e81a..9a827e32db9 100644 --- a/arch/arm/mach-pxa/include/mach/udc.h +++ b/arch/arm/mach-pxa/include/mach/udc.h @@ -2,7 +2,7 @@ * arch/arm/mach-pxa/include/mach/udc.h * */ -#include <asm/mach/udc_pxa2xx.h> +#include <linux/platform_data/pxa2xx_udc.h> extern void pxa_set_udc_info(struct pxa2xx_udc_mach_info *info); diff --git a/drivers/usb/gadget/pxa25x_udc.c b/drivers/usb/gadget/pxa25x_udc.c index 8efbf08c356..d4ca9f1f7f2 100644 --- a/drivers/usb/gadget/pxa25x_udc.c +++ b/drivers/usb/gadget/pxa25x_udc.c @@ -29,6 +29,7 @@ #include <linux/list.h> #include <linux/interrupt.h> #include <linux/mm.h> +#include <linux/platform_data/pxa2xx_udc.h> #include <linux/platform_device.h> #include <linux/dma-mapping.h> #include <linux/irq.h> @@ -59,9 +60,6 @@ #include <mach/lubbock.h> #endif -#include <asm/mach/udc_pxa2xx.h> - - /* * This driver handles the USB Device Controller (UDC) in Intel's PXA 25x * series processors. The UDC for the IXP 4xx series is very similar. diff --git a/arch/arm/include/asm/mach/udc_pxa2xx.h b/include/linux/platform_data/pxa2xx_udc.h index ea297ac70bc..c6c5e98b5b8 100644 --- a/arch/arm/include/asm/mach/udc_pxa2xx.h +++ b/include/linux/platform_data/pxa2xx_udc.h @@ -1,6 +1,4 @@ /* - * arch/arm/include/asm/mach/udc_pxa2xx.h - * * This supports machine-specific differences in how the PXA2xx * USB Device Controller (UDC) is wired. * @@ -8,6 +6,8 @@ * linux/arch/mach-ixp4xx/<machine>.c and used in * the probe routine of linux/drivers/usb/gadget/pxa2xx_udc.c */ +#ifndef PXA2XX_UDC_H +#define PXA2XX_UDC_H struct pxa2xx_udc_mach_info { int (*udc_is_connected)(void); /* do we see host? */ @@ -24,3 +24,4 @@ struct pxa2xx_udc_mach_info { int gpio_pullup; /* high == pullup activated */ }; +#endif |