diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2016-08-10 23:47:59 +0300 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2016-08-11 09:43:03 +0300 |
| commit | 12beb346710b766b8e74a7a3ac8165835bd68def (patch) | |
| tree | 89bd4c660945349d9d68f371ec496ea97785b72a /arch | |
| parent | f9db43bc296833451cbe4b03eb5e1f633ad1f787 (diff) | |
| download | linux-12beb346710b766b8e74a7a3ac8165835bd68def.tar.xz | |
Merge tag 'pxa-fixes-v4.8' of https://github.com/rjarzmik/linux into randconfig-4.8
This is the pxa changes for v4.8 cycle.
This is a tiny fix couple to enable changes in includes in
gpio API without breaking pxa boards.
* tag 'pxa-fixes-v4.8' of https://github.com/rjarzmik/linux:
ARM: pxa: add module.h for corgi symbol_get/symbol_put usage
ARM: pxa: add module.h for spitz symbol_get/symbol_put usage
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-pxa/corgi.c | 1 | ||||
| -rw-r--r-- | arch/arm/mach-pxa/spitz.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-pxa/corgi.c b/arch/arm/mach-pxa/corgi.c index dc109dc3a622..10bfdb169366 100644 --- a/arch/arm/mach-pxa/corgi.c +++ b/arch/arm/mach-pxa/corgi.c @@ -13,6 +13,7 @@ */ #include <linux/kernel.h> +#include <linux/module.h> /* symbol_get ; symbol_put */ #include <linux/init.h> #include <linux/platform_device.h> #include <linux/major.h> diff --git a/arch/arm/mach-pxa/spitz.c b/arch/arm/mach-pxa/spitz.c index 1080580b1343..2c150bfc0cd5 100644 --- a/arch/arm/mach-pxa/spitz.c +++ b/arch/arm/mach-pxa/spitz.c @@ -13,6 +13,7 @@ */ #include <linux/kernel.h> +#include <linux/module.h> /* symbol_get ; symbol_put */ #include <linux/platform_device.h> #include <linux/delay.h> #include <linux/gpio_keys.h> |