diff options
Diffstat (limited to 'drivers/usb/gadget')
-rw-r--r-- | drivers/usb/gadget/at91_udc.c | 8 | ||||
-rw-r--r-- | drivers/usb/gadget/atmel_usba_udc.c | 4 | ||||
-rw-r--r-- | drivers/usb/gadget/lh7a40x_udc.h | 2 | ||||
-rw-r--r-- | drivers/usb/gadget/omap_udc.c | 4 | ||||
-rw-r--r-- | drivers/usb/gadget/pxa25x_udc.c | 2 | ||||
-rw-r--r-- | drivers/usb/gadget/pxa25x_udc.h | 2 | ||||
-rw-r--r-- | drivers/usb/gadget/pxa27x_udc.c | 6 | ||||
-rw-r--r-- | drivers/usb/gadget/s3c2410_udc.c | 8 |
8 files changed, 18 insertions, 18 deletions
diff --git a/drivers/usb/gadget/at91_udc.c b/drivers/usb/gadget/at91_udc.c index 5b935e9ebf99..a8a1de413321 100644 --- a/drivers/usb/gadget/at91_udc.c +++ b/drivers/usb/gadget/at91_udc.c | |||
@@ -40,15 +40,15 @@ | |||
40 | #include <linux/usb/gadget.h> | 40 | #include <linux/usb/gadget.h> |
41 | 41 | ||
42 | #include <asm/byteorder.h> | 42 | #include <asm/byteorder.h> |
43 | #include <asm/arch/hardware.h> | 43 | #include <mach/hardware.h> |
44 | #include <asm/io.h> | 44 | #include <asm/io.h> |
45 | #include <asm/irq.h> | 45 | #include <asm/irq.h> |
46 | #include <asm/system.h> | 46 | #include <asm/system.h> |
47 | #include <asm/gpio.h> | 47 | #include <asm/gpio.h> |
48 | 48 | ||
49 | #include <asm/arch/board.h> | 49 | #include <mach/board.h> |
50 | #include <asm/arch/cpu.h> | 50 | #include <mach/cpu.h> |
51 | #include <asm/arch/at91sam9261_matrix.h> | 51 | #include <mach/at91sam9261_matrix.h> |
52 | 52 | ||
53 | #include "at91_udc.h" | 53 | #include "at91_udc.h" |
54 | 54 | ||
diff --git a/drivers/usb/gadget/atmel_usba_udc.c b/drivers/usb/gadget/atmel_usba_udc.c index 07e5a0b5dcda..ae30ab1d264f 100644 --- a/drivers/usb/gadget/atmel_usba_udc.c +++ b/drivers/usb/gadget/atmel_usba_udc.c | |||
@@ -22,7 +22,7 @@ | |||
22 | #include <linux/delay.h> | 22 | #include <linux/delay.h> |
23 | 23 | ||
24 | #include <asm/gpio.h> | 24 | #include <asm/gpio.h> |
25 | #include <asm/arch/board.h> | 25 | #include <mach/board.h> |
26 | 26 | ||
27 | #include "atmel_usba_udc.h" | 27 | #include "atmel_usba_udc.h" |
28 | 28 | ||
@@ -334,7 +334,7 @@ static void toggle_bias(int is_on) | |||
334 | 334 | ||
335 | #elif defined(CONFIG_ARCH_AT91) | 335 | #elif defined(CONFIG_ARCH_AT91) |
336 | 336 | ||
337 | #include <asm/arch/at91_pmc.h> | 337 | #include <mach/at91_pmc.h> |
338 | 338 | ||
339 | static void toggle_bias(int is_on) | 339 | static void toggle_bias(int is_on) |
340 | { | 340 | { |
diff --git a/drivers/usb/gadget/lh7a40x_udc.h b/drivers/usb/gadget/lh7a40x_udc.h index fd43b90df03e..ca861203a301 100644 --- a/drivers/usb/gadget/lh7a40x_udc.h +++ b/drivers/usb/gadget/lh7a40x_udc.h | |||
@@ -47,7 +47,7 @@ | |||
47 | #include <asm/irq.h> | 47 | #include <asm/irq.h> |
48 | #include <asm/system.h> | 48 | #include <asm/system.h> |
49 | #include <asm/unaligned.h> | 49 | #include <asm/unaligned.h> |
50 | #include <asm/arch/hardware.h> | 50 | #include <mach/hardware.h> |
51 | 51 | ||
52 | #include <linux/usb/ch9.h> | 52 | #include <linux/usb/ch9.h> |
53 | #include <linux/usb/gadget.h> | 53 | #include <linux/usb/gadget.h> |
diff --git a/drivers/usb/gadget/omap_udc.c b/drivers/usb/gadget/omap_udc.c index 395bd1844482..376e80c07530 100644 --- a/drivers/usb/gadget/omap_udc.c +++ b/drivers/usb/gadget/omap_udc.c | |||
@@ -52,8 +52,8 @@ | |||
52 | #include <asm/unaligned.h> | 52 | #include <asm/unaligned.h> |
53 | #include <asm/mach-types.h> | 53 | #include <asm/mach-types.h> |
54 | 54 | ||
55 | #include <asm/arch/dma.h> | 55 | #include <mach/dma.h> |
56 | #include <asm/arch/usb.h> | 56 | #include <mach/usb.h> |
57 | 57 | ||
58 | #include "omap_udc.h" | 58 | #include "omap_udc.h" |
59 | 59 | ||
diff --git a/drivers/usb/gadget/pxa25x_udc.c b/drivers/usb/gadget/pxa25x_udc.c index 7e6725d89976..da6e93c201d2 100644 --- a/drivers/usb/gadget/pxa25x_udc.c +++ b/drivers/usb/gadget/pxa25x_udc.c | |||
@@ -61,7 +61,7 @@ | |||
61 | * This driver is PXA25x only. Grab the right register definitions. | 61 | * This driver is PXA25x only. Grab the right register definitions. |
62 | */ | 62 | */ |
63 | #ifdef CONFIG_ARCH_PXA | 63 | #ifdef CONFIG_ARCH_PXA |
64 | #include <asm/arch/pxa25x-udc.h> | 64 | #include <mach/pxa25x-udc.h> |
65 | #endif | 65 | #endif |
66 | 66 | ||
67 | #include <asm/mach/udc_pxa2xx.h> | 67 | #include <asm/mach/udc_pxa2xx.h> |
diff --git a/drivers/usb/gadget/pxa25x_udc.h b/drivers/usb/gadget/pxa25x_udc.h index c8a13215e02c..1d51aa21e6eb 100644 --- a/drivers/usb/gadget/pxa25x_udc.h +++ b/drivers/usb/gadget/pxa25x_udc.h | |||
@@ -139,7 +139,7 @@ struct pxa25x_udc { | |||
139 | /*-------------------------------------------------------------------------*/ | 139 | /*-------------------------------------------------------------------------*/ |
140 | 140 | ||
141 | #ifdef CONFIG_ARCH_LUBBOCK | 141 | #ifdef CONFIG_ARCH_LUBBOCK |
142 | #include <asm/arch/lubbock.h> | 142 | #include <mach/lubbock.h> |
143 | /* lubbock can also report usb connect/disconnect irqs */ | 143 | /* lubbock can also report usb connect/disconnect irqs */ |
144 | #endif | 144 | #endif |
145 | 145 | ||
diff --git a/drivers/usb/gadget/pxa27x_udc.c b/drivers/usb/gadget/pxa27x_udc.c index 06c81a3c9277..a28513ecbe5b 100644 --- a/drivers/usb/gadget/pxa27x_udc.c +++ b/drivers/usb/gadget/pxa27x_udc.c | |||
@@ -33,13 +33,13 @@ | |||
33 | #include <linux/irq.h> | 33 | #include <linux/irq.h> |
34 | 34 | ||
35 | #include <asm/byteorder.h> | 35 | #include <asm/byteorder.h> |
36 | #include <asm/arch/hardware.h> | 36 | #include <mach/hardware.h> |
37 | 37 | ||
38 | #include <linux/usb.h> | 38 | #include <linux/usb.h> |
39 | #include <linux/usb/ch9.h> | 39 | #include <linux/usb/ch9.h> |
40 | #include <linux/usb/gadget.h> | 40 | #include <linux/usb/gadget.h> |
41 | #include <asm/arch/pxa2xx-regs.h> /* FIXME: for PSSR */ | 41 | #include <mach/pxa2xx-regs.h> /* FIXME: for PSSR */ |
42 | #include <asm/arch/udc.h> | 42 | #include <mach/udc.h> |
43 | 43 | ||
44 | #include "pxa27x_udc.h" | 44 | #include "pxa27x_udc.h" |
45 | 45 | ||
diff --git a/drivers/usb/gadget/s3c2410_udc.c b/drivers/usb/gadget/s3c2410_udc.c index 021955a57722..538807384592 100644 --- a/drivers/usb/gadget/s3c2410_udc.c +++ b/drivers/usb/gadget/s3c2410_udc.c | |||
@@ -49,10 +49,10 @@ | |||
49 | #include <asm/irq.h> | 49 | #include <asm/irq.h> |
50 | #include <asm/system.h> | 50 | #include <asm/system.h> |
51 | #include <asm/unaligned.h> | 51 | #include <asm/unaligned.h> |
52 | #include <asm/arch/irqs.h> | 52 | #include <mach/irqs.h> |
53 | 53 | ||
54 | #include <asm/arch/hardware.h> | 54 | #include <mach/hardware.h> |
55 | #include <asm/arch/regs-gpio.h> | 55 | #include <mach/regs-gpio.h> |
56 | 56 | ||
57 | #include <asm/plat-s3c24xx/regs-udc.h> | 57 | #include <asm/plat-s3c24xx/regs-udc.h> |
58 | #include <asm/plat-s3c24xx/udc.h> | 58 | #include <asm/plat-s3c24xx/udc.h> |
@@ -887,7 +887,7 @@ static void s3c2410_udc_handle_ep(struct s3c2410_ep *ep) | |||
887 | } | 887 | } |
888 | } | 888 | } |
889 | 889 | ||
890 | #include <asm/arch/regs-irq.h> | 890 | #include <mach/regs-irq.h> |
891 | 891 | ||
892 | /* | 892 | /* |
893 | * s3c2410_udc_irq - interrupt handler | 893 | * s3c2410_udc_irq - interrupt handler |