Skip to contentSkip to conversation

ARM: pxa: fix USB gadget driver compilation regression

PATCH New Linus Walleij 2 participants 2 messages Dec 11, 2013

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ARM: pxa: fix USB gadget driver compilation regression

After commit 88f718e3fa4d67f3a8dbe79a2f97d722323e4051 "ARM: pxa: delete the custom GPIO header" a compilation error was introduced in the PXA25x gadget driver. An attempt to fix the problem was made in
commit b144e4ab1ef130e8bf30bcd3e529b7f35112c503 "usb: gadget: fix pxa25x compilation problems"
by explictly stating the driver needs the <mach/hardware.h> header, which solved the compilation for a few boards, such as the pxa255-idp and its defconfig.

However the Lubbock board has this special clause in drivers/usb/gadget/pxa25x_udc.c:

This include file has an implicit dependency on <mach/irqs.h> having been included before <mach/lubbock.h> was included.

Before commit 88f718e3fa4d67f3a8dbe79a2f97d722323e4051 "ARM: pxa: delete the custom GPIO header" this implicit dependency for the pxa25x_udc compile on the Lubbock was satisfied by <linux/gpio.h> implicitly including <mach/gpio.h> which was in turn including <mach/irqs.h>, apart from the earlier added <mach/hardware.h>.

Fix this by having the PXA25x <mach/lubbock.h> explicitly include <mach/irqs.h>.

Cc Greg Kroah-Hartmann <[email protected]>
Cc Felipe Balbi <[email protected]>
---
 arch/arm/mach-pxa/include/mach/lubbock.h | 2 ++
 1 file changed, 2 insertions(+)
arch/arm/mach-pxa/include/mach/lubbock.h +2 -0
index 2a086e8373eb..958cd6af9384 100644
@@ -10,6 +10,8 @@
  * published by the Free Software Foundation.
  */
 
+#include <mach/irqs.h>
+
 #define LUBBOCK_ETH_PHYS	PXA_CS3_PHYS
 
 #define LUBBOCK_FPGA_PHYS	PXA_CS2_PHYS
Signature · 1 line
1.8.3.1
maintainer Applied
#1 lore raw

PATCH 1/1 ARM: pxa: fix USB gadget driver compilation regression

Quoted 41 lines · Linus Walleij

After commit 88f718e3fa4d67f3a8dbe79a2f97d722323e4051 "ARM: pxa: delete the custom GPIO header" a compilation error was introduced in the PXA25x gadget driver. An attempt to fix the problem was made in
commit b144e4ab1ef130e8bf30bcd3e529b7f35112c503 "usb: gadget: fix pxa25x compilation problems"
by explictly stating the driver needs the <mach/hardware.h> header, which solved the compilation for a few boards, such as the pxa255-idp and its defconfig.

However the Lubbock board has this special clause in drivers/usb/gadget/pxa25x_udc.c:

This include file has an implicit dependency on <mach/irqs.h> having been included before <mach/lubbock.h> was included.

Before commit 88f718e3fa4d67f3a8dbe79a2f97d722323e4051 "ARM: pxa: delete the custom GPIO header" this implicit dependency for the pxa25x_udc compile on the Lubbock was satisfied by <linux/gpio.h> implicitly including <mach/gpio.h> which was in turn including <mach/irqs.h>, apart from the earlier added <mach/hardware.h>.

Fix this by having the PXA25x <mach/lubbock.h> explicitly include <mach/irqs.h>.

Cc Greg Kroah-Hartmann <[email protected]>
Cc Felipe Balbi <[email protected]>
---
  arch/arm/mach-pxa/include/mach/lubbock.h | 2 ++
  1 file changed, 2 insertions(+)
arch/arm/mach-pxa/include/mach/lubbock.h +0 -0
index 2a086e8373eb..958cd6af9384 100644

arch/arm/mach-pxa/include/mach/lubbock.h line 17

Quoted 8 lines
arch/arm/mach-pxa/include/mach/lubbock.h +2 -0
@@ -10,6 +10,8 @@
   * published by the Free Software Foundation.
   */
 
+#include <mach/irqs.h>
+
  #define LUBBOCK_ETH_PHYS	PXA_CS3_PHYS
 
  #define LUBBOCK_FPGA_PHYS	PXA_CS2_PHYS

Applied.

Thanks
Haojian