From 61cbaa928705eaeabefb8a5264bc22b4ca909f6b Mon Sep 17 00:00:00 2001 From: Axel Lin Date: Sat, 10 Dec 2011 10:08:08 +0800 Subject: ARM: pxa: Include linux/export.h in balloon3.c Include linux/export.h to fix below build warning: CC arch/arm/mach-pxa/balloon3.o arch/arm/mach-pxa/balloon3.c:85: warning: data definition has no type or storage class arch/arm/mach-pxa/balloon3.c:85: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL' arch/arm/mach-pxa/balloon3.c:85: warning: parameter names (without types) in function declaration Signed-off-by: Axel Lin Acked-by: Haojian Zhuang Signed-off-by: Arnd Bergmann --- arch/arm/mach-pxa/balloon3.c | 1 + 1 file changed, 1 insertion(+) 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 #include #include #include -- cgit v1.2.3-70-g09d2 From 3f640c61f582e8e770d9930c5ae1bb717b24f830 Mon Sep 17 00:00:00 2001 From: Haojian Zhuang Date: Fri, 9 Dec 2011 09:58:41 +0800 Subject: MAINTAINERS: update pxa and mmp Merge PXA168, PXXA910 and MMP2 together. Add Haojian as maintainer of both arch-pxa and arch-mmp. Haojian's git tree is also added. Update Eric's tree since the original one is obsolte. Signed-off-by: Haojian Zhuang Signed-off-by: Arnd Bergmann --- MAINTAINERS | 22 +++++++--------------- 1 file changed, 7 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 M: Russell King +M: Haojian Zhuang 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 -M: Jason Chagas -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 -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 -M: Eric Miao 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 -- cgit v1.2.3-70-g09d2