Changeset 19290

Timestamp:

05/22/12 22:26:37 (12 months ago)

Author:

BrainSlayer

Message:

pb42 tree fixes

Location:

src/linux/universal/linux-3.4

Files:

• arch/mips/ar7240/setup.c (modified) (1 diff)
• drivers/mtd/devices/ar7100_flash.c (modified) (1 diff)
• drivers/mtd/devices/ar7240_flash.c (modified) (1 diff)
• drivers/mtd/devices/ar9100_pflash.c (modified) (1 diff)
• drivers/mtd/devices/wzrag300nh_flash.c (modified) (2 diffs)
• drivers/mtd/devices/wzrg450nh_flash.c (modified) (2 diffs)
• drivers/usb/gadget/ath_defs.h (modified) (1 diff)
• include/asm-generic/int-ll64.h (modified) (1 diff)

src/linux/universal/linux-3.4/arch/mips/ar7240/setup.c

@@ -17 +17 @@
 #include <asm/processor.h>
 #include <asm/reboot.h>
-#include <asm/system.h>
 #include <asm/serial.h>
 #include <asm/traps.h>

src/linux/universal/linux-3.4/drivers/mtd/devices/ar7100_flash.c

@@ -414 +414 @@
                 mtd->eraseregions = NULL;
                 mtd->owner = THIS_MODULE;
-                mtd->erase = ar7100_flash_erase;
-                mtd->read = ar7100_flash_read;
-                mtd->write = ar7100_flash_write;
+                mtd->_erase = ar7100_flash_erase;
+                mtd->_read = ar7100_flash_read;
+                mtd->_write = ar7100_flash_write;
 
                 printk(KERN_EMERG "scanning for root partition\n");

src/linux/universal/linux-3.4/drivers/mtd/devices/ar7240_flash.c

@@ -349 +349 @@
                 mtd->eraseregions = NULL;
                 mtd->owner = THIS_MODULE;
-                mtd->erase = ar7240_flash_erase;
-                mtd->read = ar7240_flash_read;
-                mtd->write = ar7240_flash_write;
+                mtd->_erase = ar7240_flash_erase;
+                mtd->_read = ar7240_flash_read;
+                mtd->_write = ar7240_flash_write;
 
                 printk(KERN_EMERG "scanning for root partition\n");

src/linux/universal/linux-3.4/drivers/mtd/devices/ar9100_pflash.c

@@ -265 +265 @@
     mtd->eraseregions = NULL;
     mtd->owner = THIS_MODULE;
-    mtd->erase = ar9100_flash_erase;
-    mtd->read = ar9100_flash_read;
-    mtd->write = ar9100_flash_write;
+    mtd->_erase = ar9100_flash_erase;
+    mtd->_read = ar9100_flash_read;
+    mtd->_write = ar9100_flash_write;
     mtd->priv = (void *)(&flash_geom_tbl[index]);
 

src/linux/universal/linux-3.4/drivers/mtd/devices/wzrag300nh_flash.c

@@ -713 +713 @@
         mtd->eraseregions       =   NULL;
         mtd->owner              =   THIS_MODULE;
-        mtd->erase              =   ar7100_flash_erase;
-        mtd->read               =   ar7100_flash_read;
-        mtd->write              =   ar7100_flash_write;
+        mtd->_erase              =   ar7100_flash_erase;
+        mtd->_read               =   ar7100_flash_read;
+        mtd->_write              =   ar7100_flash_write;
         mtd->priv                               = g_flash_geoms;
         int offset = 0;
@@ -725 +725 @@
 
                 while ((offset + mtd->erasesize) < mtd->size) {
-                        mtd->read(mtd,offset,512,&retlen,&buf[0]);
+                        mtd_read(mtd,offset,512,&retlen,&buf[0]);
                         if (*((__u32 *)buf) == SQUASHFS_MAGIC) {
                                 printk(KERN_EMERG "\nfound squashfs at %X\n",offset);

src/linux/universal/linux-3.4/drivers/mtd/devices/wzrg450nh_flash.c

@@ -836 +836 @@
         mtd->eraseregions       =   NULL;
         mtd->owner              =   THIS_MODULE;
-        mtd->erase              =   ar7240_flash_erase;
-        mtd->read               =   ar7240_flash_read;
-        mtd->write              =   ar7240_flash_write;
+        mtd->_erase              =   ar7240_flash_erase;
+        mtd->_read               =   ar7240_flash_read;
+        mtd->_write              =   ar7240_flash_write;
         mtd->writesize          =   1;
         mtd->priv                               = g_flash_geoms;
@@ -850 +850 @@
 
                 while ((offset + mtd->erasesize) < mtd->size) {
-                        mtd->read(mtd,offset,512,&retlen,&buf[0]);
+                        mtd_read(mtd,offset,512,&retlen,&buf[0]);
                         if (*((__u32 *)buf) == SQUASHFS_MAGIC) {
                                 printk(KERN_EMERG "\nfound squashfs at %X\n",offset);

src/linux/universal/linux-3.4/drivers/usb/gadget/ath_defs.h

@@ -88 +88 @@
  */
 struct ath_otg {
-        struct otg_transceiver          otg;
+        struct usb_phy                  otg;
         struct work_struct              work;
         struct ath_otg_vars             state;

src/linux/universal/linux-3.4/include/asm-generic/int-ll64.h

@@ -9 +9 @@
 #define _ASM_GENERIC_INT_LL64_H
 
-#include <asm-generic/bitsperlong.h>
+#include <asm/bitsperlong.h>
 
 #ifndef __ASSEMBLY__