diff options
author | Arnd Bergmann <arnd@arndb.de> | 2013-03-15 11:18:55 +0100 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2013-03-15 11:18:55 +0100 |
commit | 04cf1440c0fbb320ddea00ef878c7b53c7b7298c (patch) | |
tree | 3884c2a49862eb3d192629d13aed065deaa014f1 /arch | |
parent | 083f1717d6122feebb85bc17d2958751b24c2910 (diff) | |
parent | e71dc5f787f3908b8b8158103fc7d74a78a22cd1 (diff) | |
download | linux-04cf1440c0fbb320ddea00ef878c7b53c7b7298c.tar.gz linux-04cf1440c0fbb320ddea00ef878c7b53c7b7298c.tar.bz2 linux-04cf1440c0fbb320ddea00ef878c7b53c7b7298c.zip |
Merge branch 'armsoc/fix' of git://github.com/hzhuang1/linux into fixes
From Haojian Zhuang <haojian.zhuang@gmail.com>:
* 'armsoc/fix' of git://github.com/hzhuang1/linux:
ARM: mmp: add platform_device head file in gplugd
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/mach-mmp/gplugd.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-mmp/gplugd.c b/arch/arm/mach-mmp/gplugd.c index d1e2d595e79c..f62b68d926f4 100644 --- a/arch/arm/mach-mmp/gplugd.c +++ b/arch/arm/mach-mmp/gplugd.c @@ -9,6 +9,7 @@ */ #include <linux/init.h> +#include <linux/platform_device.h> #include <linux/gpio.h> #include <asm/mach/arch.h> |