ARM: S3C24XX: To merge s3c24xx devs.c files to one devs.c

This patch moves regarding s3c24xx dev files to one devs.c
file in plat-samsung directory and this is required to merge
to plat-samsung.

Cc: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>

2 files changed, 2 insertions, 74 deletions

diff --git a/arch/arm/mach-s3c2410/include/mach/fb.h b/arch/arm/mach-s3c2410/include/mach/fb.h
index eee0654eb8f..a957bc8ed44 100644
--- a/arch/arm/mach-s3c2410/include/mach/fb.h
+++ b/arch/arm/mach-s3c2410/include/mach/fb.h
@@ -1,74 +1 @@
-/* arch/arm/mach-s3c2410/include/mach/fb.h
- *
- * Copyright (c) 2004 Arnaud Patard <arnaud.patard@rtp-net.org>
- *
- * Inspired by pxafb.h
- *
- * 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
- * published by the Free Software Foundation.
-*/
-
-#ifndef __ASM_ARM_FB_H
-#define __ASM_ARM_FB_H
-
-#include <mach/regs-lcd.h>
-
-struct s3c2410fb_hw {
-        unsigned long   lcdcon1;
-        unsigned long   lcdcon2;
-        unsigned long   lcdcon3;
-        unsigned long   lcdcon4;
-        unsigned long   lcdcon5;
-};
-
-/* LCD description */
-struct s3c2410fb_display {
-        /* LCD type */
-        unsigned type;
-
-        /* Screen size */
-        unsigned short width;
-        unsigned short height;
-
-        /* Screen info */
-        unsigned short xres;
-        unsigned short yres;
-        unsigned short bpp;
-
-        unsigned pixclock;              /* pixclock in picoseconds */
-        unsigned short left_margin;  /* value in pixels (TFT) or HCLKs (STN) */
-        unsigned short right_margin; /* value in pixels (TFT) or HCLKs (STN) */
-        unsigned short hsync_len;    /* value in pixels (TFT) or HCLKs (STN) */
-        unsigned short upper_margin;    /* value in lines (TFT) or 0 (STN) */
-        unsigned short lower_margin;    /* value in lines (TFT) or 0 (STN) */
-        unsigned short vsync_len;       /* value in lines (TFT) or 0 (STN) */
-
-        /* lcd configuration registers */
-        unsigned long   lcdcon5;
-};
-
-struct s3c2410fb_mach_info {
-
-        struct s3c2410fb_display *displays;     /* attached diplays info */
-        unsigned num_displays;                  /* number of defined displays */
-        unsigned default_display;
-
-        /* GPIOs */
-
-        unsigned long   gpcup;
-        unsigned long   gpcup_mask;
-        unsigned long   gpccon;
-        unsigned long   gpccon_mask;
-        unsigned long   gpdup;
-        unsigned long   gpdup_mask;
-        unsigned long   gpdcon;
-        unsigned long   gpdcon_mask;
-
-        /* lpc3600 control register */
-        unsigned long   lpcsel;
-};
-
-extern void __init s3c24xx_fb_set_platdata(struct s3c2410fb_mach_info *);
-
-#endif /* __ASM_ARM_FB_H */
+#include <plat/fb-s3c2410.h>
diff --git a/arch/arm/mach-s3c2410/mach-qt2410.c b/arch/arm/mach-s3c2410/mach-qt2410.c
index f44f77531b1..8ee6f43b40e 100644
--- a/arch/arm/mach-s3c2410/mach-qt2410.c
+++ b/arch/arm/mach-s3c2410/mach-qt2410.c
@@ -49,6 +49,7 @@
 
 #include <mach/regs-gpio.h>
 #include <mach/leds-gpio.h>
+#include <mach/regs-lcd.h>
 #include <plat/regs-serial.h>
 #include <mach/fb.h>
 #include <plat/nand.h>