Skip to content

Commit

Permalink
ARM: pxa: fix USB gadget driver compilation regression
Browse files Browse the repository at this point in the history
After commit 88f718e
"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 b144e4a
"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 88f718e
"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>.

Reported-by: Russell King <[email protected]>
Cc: Greg Kroah-Hartmann <[email protected]>
Cc: Felipe Balbi <[email protected]>
Signed-off-by: Linus Walleij <[email protected]>
Signed-off-by: Haojian Zhuang <[email protected]>
Signed-off-by: Olof Johansson <[email protected]>
  • Loading branch information
linusw authored and olofj committed Dec 28, 2013
1 parent 95fcfa7 commit 9928422
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions arch/arm/mach-pxa/include/mach/lubbock.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 9928422

Please sign in to comment.