diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-12-28 10:47:27 +0000 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-12-28 10:47:27 +0000 |
| commit | 39fbc76272225fb991ffdfac1e08974506cfa3eb (patch) | |
| tree | 1e3ffcdfd8fc9199da381da95384ec7fbec515c3 | |
| parent | bcdbbe3d45fab12eb8a34eb52b89f91624dc4d6f (diff) | |
| parent | 3f640c61f582e8e770d9930c5ae1bb717b24f830 (diff) | |
Merge branch 'pxa/fixes-non-critical' into next/fixes-non-critical
* pxa/fixes-non-critical:
MAINTAINERS: update pxa and mmp
ARM: pxa: Include linux/export.h in balloon3.c
| -rw-r--r-- | MAINTAINERS | 22 | ||||
| -rw-r--r-- | arch/arm/mach-pxa/balloon3.c | 1 |
2 files changed, 8 insertions, 15 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index b9db108f01c..a61a0d1a0b4 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -5302,7 +5302,10 @@ F: drivers/media/video/pvrusb2/ PXA2xx/PXA3xx SUPPORT M: Eric Miao <eric.y.miao@gmail.com> M: Russell King <linux@arm.linux.org.uk> +M: Haojian Zhuang <haojian.zhuang@marvell.com> L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) +T: git git://github.com/hzhuang1/linux.git +T: git git://git.linaro.org/people/ycmiao/pxa-linux.git S: Maintained F: arch/arm/mach-pxa/ F: drivers/pcmcia/pxa2xx* @@ -5312,25 +5315,14 @@ F: include/sound/pxa2xx-lib.h F: sound/arm/pxa* F: sound/soc/pxa -PXA168 SUPPORT -M: Eric Miao <eric.y.miao@gmail.com> -M: Jason Chagas <jason.chagas@marvell.com> -L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) -T: git git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6.git -S: Maintained - -PXA910 SUPPORT +MMP SUPPORT M: Eric Miao <eric.y.miao@gmail.com> -L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) -T: git git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6.git -S: Maintained - -MMP2 SUPPORT (aka ARMADA610) M: Haojian Zhuang <haojian.zhuang@marvell.com> -M: Eric Miao <eric.y.miao@gmail.com> L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) -T: git git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6.git +T: git git://github.com/hzhuang1/linux.git +T: git git://git.linaro.org/people/ycmiao/pxa-linux.git S: Maintained +F: arch/arm/mach-mmp/ PXA MMCI DRIVER S: Orphan diff --git a/arch/arm/mach-pxa/balloon3.c b/arch/arm/mach-pxa/balloon3.c index 4b81f59a4cb..f3a456a0680 100644 --- a/arch/arm/mach-pxa/balloon3.c +++ b/arch/arm/mach-pxa/balloon3.c @@ -13,6 +13,7 @@ * published by the Free Software Foundation. */ +#include <linux/export.h> #include <linux/init.h> #include <linux/platform_device.h> #include <linux/interrupt.h> |