]> git.baikalelectronics.ru Git - kernel.git/commit
ARM: pxa: fix USB gadget driver compilation regression
authorLinus Walleij <linus.walleij@linaro.org>
Wed, 11 Dec 2013 08:48:58 +0000 (09:48 +0100)
committerOlof Johansson <olof@lixom.net>
Sat, 28 Dec 2013 23:18:34 +0000 (15:18 -0800)
commit122ffbdf3be768a112fdad39970469ce3a084076
treee2803f892add85f20fd246ccbe424b03ba59884e
parentd9f465339c4439598e89778ea36dc125a4cf4687
ARM: pxa: fix USB gadget driver compilation regression

After commit 86d4135abdf9e6b9bc108e514db109b2effd6674
"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 c6ae77746ba0ea30682d48ba64709a0049a1a836
"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 86d4135abdf9e6b9bc108e514db109b2effd6674
"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 <rmk+kernel@arm.linux.org.uk>
Cc: Greg Kroah-Hartmann <gregkh@linuxfoundation.org>
Cc: Felipe Balbi <balbi@ti.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Haojian Zhuang <haojian.zhuang@gmail.com>
Signed-off-by: Olof Johansson <olof@lixom.net>
arch/arm/mach-pxa/include/mach/lubbock.h