summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-pxa
diff options
context:
space:
mode:
authorWei Yongjun <weiyj.lk@gmail.com>2016-10-29 13:56:30 +0200
committerRobert Jarzmik <robert.jarzmik@free.fr>2016-11-02 22:44:51 +0100
commitf2131c543649caade98e5834ee3f45c75a73a6a8 (patch)
tree561e7fc19889ce47e2212e18fcd0cfeede4b42da /arch/arm/mach-pxa
parentARM: pxa: em-x270: use the new pxa_camera platform_data (diff)
downloadlinux-f2131c543649caade98e5834ee3f45c75a73a6a8.tar.xz
linux-f2131c543649caade98e5834ee3f45c75a73a6a8.zip
ARM: pxa: remove duplicated include from spitz.c
This partially reverts commit 12beb346710b ("Merge tag 'pxa-fixes-v4.8' of https://github.com/rjarzmik/linux into randconfig-4.8"). This former patch introduced accidentally a double include of module.h. Signed-off-by: Wei Yongjun <weiyj.lk@gmail.com> Acked-by: Paul Gortmaker <paul.gortmaker@windriver.com> [amended commit message and 2 comments] Signed-off-by: Robert Jarzmik <robert.jarzmik@free.fr>
Diffstat (limited to 'arch/arm/mach-pxa')
-rw-r--r--arch/arm/mach-pxa/corgi.c1
-rw-r--r--arch/arm/mach-pxa/spitz.c1
2 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/mach-pxa/corgi.c b/arch/arm/mach-pxa/corgi.c
index 10bfdb169366..183cd3446f25 100644
--- a/arch/arm/mach-pxa/corgi.c
+++ b/arch/arm/mach-pxa/corgi.c
@@ -35,7 +35,6 @@
#include <linux/mtd/sharpsl.h>
#include <linux/input/matrix_keypad.h>
#include <linux/gpio_keys.h>
-#include <linux/module.h>
#include <linux/memblock.h>
#include <video/w100fb.h>
diff --git a/arch/arm/mach-pxa/spitz.c b/arch/arm/mach-pxa/spitz.c
index 2c150bfc0cd5..67d66c702574 100644
--- a/arch/arm/mach-pxa/spitz.c
+++ b/arch/arm/mach-pxa/spitz.c
@@ -31,7 +31,6 @@
#include <linux/input/matrix_keypad.h>
#include <linux/regulator/machine.h>
#include <linux/io.h>
-#include <linux/module.h>
#include <linux/reboot.h>
#include <linux/memblock.h>