Changeset 17973

Timestamp:

12/07/11 19:02:53 (18 months ago)

Author:

BrainSlayer

Message:

only for trying

Location:

src/linux/pb42/linux-2.6.34.6

Files:

• arch/mips/ar7100/gpio_driver.c (modified) (3 diffs)
• drivers/mtd/chips/cfi_cmdset_0002.c (modified) (1 diff)

src/linux/pb42/linux-2.6.34.6/arch/mips/ar7100/gpio_driver.c

@@ -329 +329 @@
 
 //wl gpios
-
+#ifndef CONFIG_AR9100
 
         {
@@ -491 +491 @@
                 .active_low     = 1,
         }, 
-
-
-
+#endif
 };
 
@@ -500 +498 @@
 {
         int err;
-
+        printk(KERN_INFO "Register LED Device\n");
         if (!request_mem_region(AR71XX_GPIO_BASE, AR71XX_GPIO_SIZE,
                                 "AR71xx GPIO controller"))

src/linux/pb42/linux-2.6.34.6/drivers/mtd/chips/cfi_cmdset_0002.c

@@ -621 +621 @@
 
         case FL_ERASING:
-                if (1 /* no suspend */ || !cfip || !(cfip->EraseSuspend & (0x1|0x2)) ||
+//              if (1 /* no suspend */ || !cfip || !(cfip->EraseSuspend & (0x1|0x2)) ||
+                if (!cfip || !(cfip->EraseSuspend & (0x1|0x2)) ||
                     !(mode == FL_READY || mode == FL_POINT ||
                     (mode == FL_WRITING && (cfip->EraseSuspend & 0x2))))