summaryrefslogtreecommitdiffstats
path: root/drivers/video
diff options
context:
space:
mode:
authorJuergen Beisert <jbe@pengutronix.de>2012-01-02 12:43:54 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2012-01-02 13:32:13 +0100
commitb5a92c0ff1236aa45605d48eca0a3b6694f672e1 (patch)
tree3e785cd97e97d224432734e2e1a0616f22c0726a /drivers/video
parentd32acc554427a6bfce171a07b571b493e573d224 (diff)
downloadbarebox-b5a92c0ff1236aa45605d48eca0a3b6694f672e1.tar.gz
barebox-b5a92c0ff1236aa45605d48eca0a3b6694f672e1.tar.xz
MACH SAMSUNG/S3C: Reflect the CPU name the LCD driver is for
This LCD driver is for the LCD controller in the S3C2410/S3C2440 CPUs only. Change its name to reflect its usage and free the way to add LCD controller drivers for more recent Samsung CPUs. Signed-off-by: Juergen Beisert <jbe@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers/video')
-rw-r--r--drivers/video/Kconfig2
-rw-r--r--drivers/video/Makefile2
-rw-r--r--drivers/video/s3c24xx.c (renamed from drivers/video/s3c.c)4
3 files changed, 4 insertions, 4 deletions
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index df2157eec7..4a05af99d8 100644
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -27,7 +27,7 @@ config DRIVER_VIDEO_STM
Say 'Y' here to enable framebuffer and splash screen support for
i.MX23 and i.MX28 based systems.
-config DRIVER_VIDEO_S3C
+config DRIVER_VIDEO_S3C24XX
bool "S3C244x framebuffer driver"
depends on ARCH_S3C24xx
help
diff --git a/drivers/video/Makefile b/drivers/video/Makefile
index 123c46f588..913c78d92b 100644
--- a/drivers/video/Makefile
+++ b/drivers/video/Makefile
@@ -3,5 +3,5 @@ obj-$(CONFIG_VIDEO) += fb.o
obj-$(CONFIG_DRIVER_VIDEO_STM) += stm.o
obj-$(CONFIG_DRIVER_VIDEO_IMX) += imx.o
obj-$(CONFIG_DRIVER_VIDEO_IMX_IPU) += imx-ipu-fb.o
-obj-$(CONFIG_DRIVER_VIDEO_S3C) += s3c.o
+obj-$(CONFIG_DRIVER_VIDEO_S3C24XX) += s3c24xx.o
obj-$(CONFIG_DRIVER_VIDEO_PXA) += pxa.o
diff --git a/drivers/video/s3c.c b/drivers/video/s3c24xx.c
index a03ec3dac7..75677c31a6 100644
--- a/drivers/video/s3c.c
+++ b/drivers/video/s3c24xx.c
@@ -30,9 +30,9 @@
#include <malloc.h>
#include <errno.h>
#include <io.h>
-#include <mach/gpio.h>
+#include <mach/s3c-gpio.h>
#include <mach/s3c-generic.h>
-#include <mach/fb.h>
+#include <mach/s3c24xx-fb.h>
#define LCDCON1 0x00
# define PNRMODE(x) (((x) & 3) << 5)