remove the symlink as well when removing the adam2 patcher

[openwrt.git] / target / linux / atheros-2.6 / files / drivers / mtd / devices / spiflash.c

diff --git a/target/linux/atheros-2.6/files/drivers/mtd/devices/spiflash.c b/target/linux/atheros-2.6/files/drivers/mtd/devices/spiflash.c
index 32a132a..75a59d6 100644 (file)
--- a/target/linux/atheros-2.6/files/drivers/mtd/devices/spiflash.c
+++ b/target/linux/atheros-2.6/files/drivers/mtd/devices/spiflash.c
@@ -84,7 +84,8 @@ struct flashconfig {
         { STM_1MB_BYTE_COUNT, STM_1MB_SECTOR_COUNT, STM_1MB_SECTOR_SIZE, 0x0},
         { STM_2MB_BYTE_COUNT, STM_2MB_SECTOR_COUNT, STM_2MB_SECTOR_SIZE, 0x0},
         { STM_4MB_BYTE_COUNT, STM_4MB_SECTOR_COUNT, STM_4MB_SECTOR_SIZE, 0x0},
-        { STM_8MB_BYTE_COUNT, STM_8MB_SECTOR_COUNT, STM_8MB_SECTOR_SIZE, 0x0}
+        { STM_8MB_BYTE_COUNT, STM_8MB_SECTOR_COUNT, STM_8MB_SECTOR_SIZE, 0x0},
+        { STM_16MB_BYTE_COUNT, STM_16MB_SECTOR_COUNT, STM_16MB_SECTOR_SIZE, 0x0}
     };
 
 /* Mapping of generic opcodes to STM serial flash opcodes */
@@ -215,6 +216,9 @@ spiflash_probe_chip (void)
         case STM_64MBIT_SIGNATURE:
                flash_size = FLASH_8MB;
                break;
+        case STM_128MBIT_SIGNATURE:
+               flash_size = FLASH_16MB;
+               break;
         default:
                printk (KERN_WARNING "%s: Read of flash device signature failed!\n", module_name);
                return (0);
@@ -472,12 +476,6 @@ static int spiflash_probe(struct platform_device *pdev)
 #endif
        /* parse redboot partitions */
        num_parts = parse_mtd_partitions(mtd, part_probe_types, &spidata->parsed_parts, 0);
-       for (i = 0; i < num_parts; i++) {
-               if (!strcmp(spidata->parsed_parts[i].name, ROOTFS_NAME)) {
-                       /* create the root device */
-                       ROOT_DEV = MKDEV(MTD_BLOCK_MAJOR, i);
-               }
-       }
 
 #ifdef SPIFLASH_DEBUG
        printk (KERN_DEBUG "Found %d partitions\n", num_parts);