| Message ID | 1423004670-16711-1-git-send-email-robh@kernel.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Tue, Feb 03, 2015 at 05:04:30PM -0600, Rob Herring wrote: > Remove some left-over ARM only includes in order to enable building on > ARM64. __raw_{read,write}l were getting implicitly included, so add > linux/io.h include. > > Signed-off-by: Rob Herring <robh@kernel.org> > Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com> > Cc: linux-input@vger.kernel.org Applied, thank you. > --- > drivers/input/keyboard/pxa27x_keypad.c | 5 +---- > 1 file changed, 1 insertion(+), 4 deletions(-) > > diff --git a/drivers/input/keyboard/pxa27x_keypad.c b/drivers/input/keyboard/pxa27x_keypad.c > index a90d6bd..a89488a 100644 > --- a/drivers/input/keyboard/pxa27x_keypad.c > +++ b/drivers/input/keyboard/pxa27x_keypad.c > @@ -20,6 +20,7 @@ > #include <linux/module.h> > #include <linux/interrupt.h> > #include <linux/input.h> > +#include <linux/io.h> > #include <linux/device.h> > #include <linux/platform_device.h> > #include <linux/clk.h> > @@ -28,10 +29,6 @@ > #include <linux/slab.h> > #include <linux/of.h> > > -#include <asm/mach/arch.h> > -#include <asm/mach/map.h> > - > -#include <mach/hardware.h> > #include <linux/platform_data/keypad-pxa27x.h> > /* > * Keypad Controller registers > -- > 2.1.0 >
diff --git a/drivers/input/keyboard/pxa27x_keypad.c b/drivers/input/keyboard/pxa27x_keypad.c index a90d6bd..a89488a 100644 --- a/drivers/input/keyboard/pxa27x_keypad.c +++ b/drivers/input/keyboard/pxa27x_keypad.c @@ -20,6 +20,7 @@ #include <linux/module.h> #include <linux/interrupt.h> #include <linux/input.h> +#include <linux/io.h> #include <linux/device.h> #include <linux/platform_device.h> #include <linux/clk.h> @@ -28,10 +29,6 @@ #include <linux/slab.h> #include <linux/of.h> -#include <asm/mach/arch.h> -#include <asm/mach/map.h> - -#include <mach/hardware.h> #include <linux/platform_data/keypad-pxa27x.h> /* * Keypad Controller registers
Remove some left-over ARM only includes in order to enable building on ARM64. __raw_{read,write}l were getting implicitly included, so add linux/io.h include. Signed-off-by: Rob Herring <robh@kernel.org> Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com> Cc: linux-input@vger.kernel.org --- drivers/input/keyboard/pxa27x_keypad.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)