- port, cleanup Emulab ICMP Ping Of Death (IPOD) patch from 2.4.x

[linux-2.6.git] / drivers / video / sa1100fb.c

diff --git a/drivers/video/sa1100fb.c b/drivers/video/sa1100fb.c
index 7022df0..1bca4cd 100644 (file)
--- a/drivers/video/sa1100fb.c
+++ b/drivers/video/sa1100fb.c
@@ -326,6 +326,22 @@ static struct sa1100fb_mach_info brutus_info __initdata = {
 };
 #endif
 
+#ifdef CONFIG_SA1100_COLLIE
+static struct sa1100fb_mach_info collie_info __initdata = {
+       .pixclock       = 171521,       .bpp            = 16,
+       .xres           = 320,          .yres           = 240,
+
+       .hsync_len      = 5,            .vsync_len      = 1,
+       .left_margin    = 11,           .upper_margin   = 2,
+       .right_margin   = 30,           .lower_margin   = 0,
+
+       .sync           = FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,
+
+       .lccr0          = LCCR0_Color | LCCR0_Sngl | LCCR0_Act,
+       .lccr3          = LCCR3_OutEnH | LCCR3_PixRsEdg | LCCR3_ACBsDiv(2),
+};
+#endif
+
 #ifdef CONFIG_SA1100_FREEBIRD
 #warning Please check this carefully
 static struct sa1100fb_mach_info freebird_info __initdata = {
@@ -635,6 +651,11 @@ sa1100fb_get_machine_info(struct sa1100fb_info *fbi)
                inf = &brutus_info;
        }
 #endif
+#ifdef CONFIG_SA1100_COLLIE
+       if (machine_is_collie()) {
+               inf = &collie_info;
+       }
+#endif
 #ifdef CONFIG_SA1100_FREEBIRD
        if (machine_is_freebird()) {
                inf = &freebird_info;
@@ -1765,8 +1786,6 @@ static int __init sa1100fb_probe(struct device *dev)
 #endif
 
        /* This driver cannot be unloaded at the moment */
-       MOD_INC_USE_COUNT;
-
        return 0;
 
 failed: