From 25d5cc59fa8873ec10b59d20bf5a72c1f0dcef10 Mon Sep 17 00:00:00 2001 From: Marek Szyprowski Date: Tue, 18 May 2010 12:38:43 +0200 Subject: [PATCH] --- yaml --- r: 192069 b: refs/heads/master c: b884c0e07058478bff82b8edcecff4e2919fa361 h: refs/heads/master i: 192067: 922512735cf82b213d345d0cfe84370dc2e3f2ac v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-s5pc100/Kconfig | 7 ++++++- trunk/arch/arm/mach-s5pc100/Makefile | 1 + .../arm/{plat-s5pc1xx => mach-s5pc100}/setup-fb-24bpp.c | 4 ++-- trunk/arch/arm/plat-s5pc1xx/Kconfig | 5 ----- trunk/arch/arm/plat-s5pc1xx/Makefile | 1 - 6 files changed, 10 insertions(+), 10 deletions(-) rename trunk/arch/arm/{plat-s5pc1xx => mach-s5pc100}/setup-fb-24bpp.c (91%) diff --git a/[refs] b/[refs] index b03abbb9ce06..99ed0793bc91 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c8bb9635f926aaf15987450c57af05e422874b92 +refs/heads/master: b884c0e07058478bff82b8edcecff4e2919fa361 diff --git a/trunk/arch/arm/mach-s5pc100/Kconfig b/trunk/arch/arm/mach-s5pc100/Kconfig index 27ec167d2808..7d9b68c8fef5 100644 --- a/trunk/arch/arm/mach-s5pc100/Kconfig +++ b/trunk/arch/arm/mach-s5pc100/Kconfig @@ -12,6 +12,11 @@ config CPU_S5PC100 help Enable S5PC100 CPU support +config S5PC100_SETUP_FB_24BPP + bool + help + Common setup code for S5PC1XX with an 24bpp RGB display helper. + config S5PC100_SETUP_SDHCI bool select S5PC1XX_SETUP_SDHCI_GPIO @@ -28,7 +33,7 @@ config MACH_SMDKC100 select S3C_DEV_HSMMC2 select S5PC1XX_SETUP_I2C0 select S5PC1XX_SETUP_I2C1 - select S5PC1XX_SETUP_FB_24BPP + select S5PC100_SETUP_FB_24BPP select S5PC100_SETUP_SDHCI help Machine support for the Samsung SMDKC100 diff --git a/trunk/arch/arm/mach-s5pc100/Makefile b/trunk/arch/arm/mach-s5pc100/Makefile index 4199ce2b161a..1d1276c29cff 100644 --- a/trunk/arch/arm/mach-s5pc100/Makefile +++ b/trunk/arch/arm/mach-s5pc100/Makefile @@ -15,6 +15,7 @@ obj-$(CONFIG_CPU_S5PC100) += cpu.o gpiolib.o # Helper and device support +obj-$(CONFIG_S5PC100_SETUP_FB_24BPP) += setup-fb-24bpp.o obj-$(CONFIG_S5PC100_SETUP_SDHCI) += setup-sdhci.o # machine support diff --git a/trunk/arch/arm/plat-s5pc1xx/setup-fb-24bpp.c b/trunk/arch/arm/mach-s5pc100/setup-fb-24bpp.c similarity index 91% rename from trunk/arch/arm/plat-s5pc1xx/setup-fb-24bpp.c rename to trunk/arch/arm/mach-s5pc100/setup-fb-24bpp.c index b02c36fb10d1..6eba6cb8e2f4 100644 --- a/trunk/arch/arm/plat-s5pc1xx/setup-fb-24bpp.c +++ b/trunk/arch/arm/mach-s5pc100/setup-fb-24bpp.c @@ -1,9 +1,9 @@ /* - * linux/arch/arm/plat-s5pc100/setup-fb-24bpp.c + * linux/arch/arm/mach-s5pc100/setup-fb-24bpp.c * * Copyright 2009 Samsung Electronics * - * Base S5PC1XX setup information for 24bpp LCD framebuffer + * Base S5PC100 setup information for 24bpp LCD framebuffer * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as diff --git a/trunk/arch/arm/plat-s5pc1xx/Kconfig b/trunk/arch/arm/plat-s5pc1xx/Kconfig index 98bbaf9d2219..708f7a0de065 100644 --- a/trunk/arch/arm/plat-s5pc1xx/Kconfig +++ b/trunk/arch/arm/plat-s5pc1xx/Kconfig @@ -39,11 +39,6 @@ config CPU_S5PC100_CLOCK # platform specific device setup -config S5PC1XX_SETUP_FB_24BPP - bool - help - Common setup code for S5PC1XX with an 24bpp RGB display helper. - config S5PC1XX_SETUP_I2C0 bool default y diff --git a/trunk/arch/arm/plat-s5pc1xx/Makefile b/trunk/arch/arm/plat-s5pc1xx/Makefile index 540fca5b4860..a5b90c0cc487 100644 --- a/trunk/arch/arm/plat-s5pc1xx/Makefile +++ b/trunk/arch/arm/plat-s5pc1xx/Makefile @@ -23,7 +23,6 @@ obj-$(CONFIG_CPU_S5PC100_CLOCK) += s5pc100-clock.o # Device setup -obj-$(CONFIG_S5PC1XX_SETUP_FB_24BPP) += setup-fb-24bpp.o obj-$(CONFIG_S5PC1XX_SETUP_I2C0) += setup-i2c0.o obj-$(CONFIG_S5PC1XX_SETUP_I2C1) += setup-i2c1.o obj-$(CONFIG_S5PC1XX_SETUP_SDHCI_GPIO) += setup-sdhci-gpio.o