Merge branches 'release', 'acpi_pm_device_sleep_state' and 'battery' into release

[linux-2.6-omap-h63xx.git] / drivers / video / s3c2410fb.h

diff --git a/drivers/video/s3c2410fb.h b/drivers/video/s3c2410fb.h
index 17c7915b7acde81c90c0ea1f67a2576689e601e8..dbb73b95e2efd24167c7446eaf1544ed6a297c60 100644 (file)
--- a/drivers/video/s3c2410fb.h
+++ b/drivers/video/s3c2410fb.h
@@ -16,7 +16,7 @@
  *
  * 2004-09-07: Arnaud Patard <arnaud.patard@rtp-net.org>
  *     - Renamed from h1940fb.h to s3c2410fb.h
- *     - Chenged h1940 to s3c2410
+ *     - Changed h1940 to s3c2410
  *
  * 2004-07-15: Arnaud Patard <arnaud.patard@rtp-net.org>
  *     - First version
@@ -25,26 +25,22 @@
 #ifndef __S3C2410FB_H
 #define __S3C2410FB_H
 
+enum s3c_drv_type {
+       DRV_S3C2410,
+       DRV_S3C2412,
+};
+
 struct s3c2410fb_info {
-       struct fb_info          *fb;
        struct device           *dev;
        struct clk              *clk;
 
        struct resource         *mem;
        void __iomem            *io;
+       void __iomem            *irq_base;
 
-       struct s3c2410fb_mach_info *mach_info;
-
-       /* raw memory addresses */
-       dma_addr_t              map_dma;        /* physical */
-       u_char *                map_cpu;        /* virtual */
-       u_int                   map_size;
-
+       enum s3c_drv_type       drv_type;
        struct s3c2410fb_hw     regs;
 
-       /* addresses of pieces placed in raw buffer */
-       u_char *                screen_cpu;     /* virtual address of buffer */
-       dma_addr_t              screen_dma;     /* physical address of buffer */
        unsigned int            palette_ready;
 
        /* keep these registers in case we need to re-write palette */