From a156f5cdef7467bf5dd38c4bf1ae1b63966ccc07 Mon Sep 17 00:00:00 2001 From: Heiko Stuebner Date: Fri, 2 Dec 2011 13:51:56 +0900 Subject: [PATCH] --- yaml --- r: 276511 b: refs/heads/master c: 769bbb634f30c1b76277623676011a77f31bcc20 h: refs/heads/master i: 276509: d17b97e8b02289641374a03682dea6dd44bb77bf 276507: f0f435ed30c28d023d48b09746bf443bd526275c 276503: 7aa16752ec1a36d3a416fa4ae6beabc7aa9e4ef0 276495: ac8b42b602c35054516fd89c252e194205a1c044 276479: fb4d3be6a95f9de1b4e69d9f5ccc5225b084aa7d v: v3 --- [refs] | 2 +- trunk/MAINTAINERS | 24 ++------------------ trunk/arch/arm/mach-s3c64xx/dev-spi.c | 1 - trunk/arch/arm/mach-s3c64xx/s3c6400.c | 2 +- trunk/arch/arm/mach-s3c64xx/setup-fb-24bpp.c | 2 +- 5 files changed, 5 insertions(+), 26 deletions(-) diff --git a/[refs] b/[refs] index 959aa9bdbe4e..c40c286501e3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 71b33a4f7c864bf5fc893b5ca144770ad05f1d4a +refs/heads/master: 769bbb634f30c1b76277623676011a77f31bcc20 diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 447560284996..1445a830b4f8 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -1059,31 +1059,11 @@ S: Maintained F: arch/arm/plat-samsung/ F: arch/arm/plat-s3c24xx/ F: arch/arm/plat-s5p/ +F: arch/arm/mach-s3c24*/ +F: arch/arm/mach-s3c64xx/ F: drivers/*/*s3c2410* F: drivers/*/*/*s3c2410* -ARM/S3C2410 ARM ARCHITECTURE -M: Ben Dooks -L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) -W: http://www.fluff.org/ben/linux/ -S: Maintained -F: arch/arm/mach-s3c2410/ - -ARM/S3C244x ARM ARCHITECTURE -M: Ben Dooks -L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) -W: http://www.fluff.org/ben/linux/ -S: Maintained -F: arch/arm/mach-s3c2440/ -F: arch/arm/mach-s3c2443/ - -ARM/S3C64xx ARM ARCHITECTURE -M: Ben Dooks -L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) -W: http://www.fluff.org/ben/linux/ -S: Maintained -F: arch/arm/mach-s3c64xx/ - ARM/S5P EXYNOS ARM ARCHITECTURES M: Kukjin Kim L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) diff --git a/trunk/arch/arm/mach-s3c64xx/dev-spi.c b/trunk/arch/arm/mach-s3c64xx/dev-spi.c index 3341fd118723..5e6b42089eb4 100644 --- a/trunk/arch/arm/mach-s3c64xx/dev-spi.c +++ b/trunk/arch/arm/mach-s3c64xx/dev-spi.c @@ -10,7 +10,6 @@ #include #include -#include #include #include #include diff --git a/trunk/arch/arm/mach-s3c64xx/s3c6400.c b/trunk/arch/arm/mach-s3c64xx/s3c6400.c index 51c00f2453c6..7a3bc32df425 100644 --- a/trunk/arch/arm/mach-s3c64xx/s3c6400.c +++ b/trunk/arch/arm/mach-s3c64xx/s3c6400.c @@ -70,7 +70,7 @@ void __init s3c6400_init_irq(void) s3c64xx_init_irq(~0 & ~(0xf << 5), ~0); } -static struct sysdev_class s3c6400_sysclass = { +struct sysdev_class s3c6400_sysclass = { .name = "s3c6400-core", }; diff --git a/trunk/arch/arm/mach-s3c64xx/setup-fb-24bpp.c b/trunk/arch/arm/mach-s3c64xx/setup-fb-24bpp.c index 2cf80026c58d..83d2afb79e9f 100644 --- a/trunk/arch/arm/mach-s3c64xx/setup-fb-24bpp.c +++ b/trunk/arch/arm/mach-s3c64xx/setup-fb-24bpp.c @@ -20,7 +20,7 @@ #include #include -void s3c64xx_fb_gpio_setup_24bpp(void) +extern void s3c64xx_fb_gpio_setup_24bpp(void) { s3c_gpio_cfgrange_nopull(S3C64XX_GPI(0), 16, S3C_GPIO_SFN(2)); s3c_gpio_cfgrange_nopull(S3C64XX_GPJ(0), 12, S3C_GPIO_SFN(2));