Merge with rsync://fileserver/linux

Update to 2.6.12-rc3

3 files changed, 40 insertions, 15 deletions

diff --git a/drivers/mtd/afs.c b/drivers/mtd/afs.c
index 801e6c7d0892..7363e101eb0f 100644
--- a/drivers/mtd/afs.c
+++ b/drivers/mtd/afs.c
@@ -219,7 +219,7 @@ static int parse_afs_partitions(struct mtd_info *mtd,
          */
         for (idx = off = 0; off < mtd->size; off += mtd->erasesize) {
                 struct image_info_struct iis;
-                u_int iis_ptr, img_ptr, size;
+                u_int iis_ptr, img_ptr;
 
                 /* Read the footer. */
                 ret = afs_read_footer(mtd, &img_ptr, &iis_ptr, off, mask);
@@ -236,21 +236,9 @@ static int parse_afs_partitions(struct mtd_info *mtd,
                         continue;
 
                 strcpy(str, iis.name);
-                size = mtd->erasesize + off - img_ptr;
-
-                /*
-                 * In order to support JFFS2 partitions on this layout,
-                 * we must lie to MTD about the real size of JFFS2
-                 * partitions; this ensures that the AFS flash footer
-                 * won't be erased by JFFS2.  Please ensure that your
-                 * JFFS2 partitions are given image numbers between
-                 * 1000 and 2000 inclusive.
-                 */
-                if (iis.imageNumber >= 1000 && iis.imageNumber < 2000)
-                        size -= mtd->erasesize;
 
                 parts[idx].name         = str;
-                parts[idx].size         = size;
+                parts[idx].size         = (iis.length + mtd->erasesize - 1) & ~(mtd->erasesize - 1);
                 parts[idx].offset       = img_ptr;
                 parts[idx].mask_flags   = 0;
 
diff --git a/drivers/mtd/maps/Kconfig b/drivers/mtd/maps/Kconfig
index ac853d4d1668..44781a83b2e7 100644
--- a/drivers/mtd/maps/Kconfig
+++ b/drivers/mtd/maps/Kconfig
@@ -551,6 +551,16 @@ config MTD_PCMCIA
           cards are usually around 4-16MiB in size. This does not include
           Compact Flash cards which are treated as IDE devices.
 
+config MTD_PCMCIA_ANONYMOUS
+        bool "Use PCMCIA MTD drivers for anonymous PCMCIA cards"
+        depends on MTD_PCMCIA
+        default N
+        help
+          If this option is enabled, PCMCIA cards which do not report
+          anything about themselves are assumed to be MTD cards.
+
+          If unsure, say N.
+
 config MTD_UCLINUX
         tristate "Generic uClinux RAM/ROM filesystem support"
         depends on MTD_PARTITIONS && !MMU
diff --git a/drivers/mtd/maps/pcmciamtd.c b/drivers/mtd/maps/pcmciamtd.c
index e37b4c1976e5..c2655a817e3d 100644
--- a/drivers/mtd/maps/pcmciamtd.c
+++ b/drivers/mtd/maps/pcmciamtd.c
@@ -818,6 +818,32 @@ static dev_link_t *pcmciamtd_attach(void)
         return link;
 }
 
+static struct pcmcia_device_id pcmciamtd_ids[] = {
+        PCMCIA_DEVICE_FUNC_ID(1),
+        PCMCIA_DEVICE_PROD_ID123("IO DATA", "PCS-2M", "2MB SRAM", 0x547e66dc, 0x1fed36cd, 0x36eadd21),
+        PCMCIA_DEVICE_PROD_ID12("IBM", "2MB SRAM", 0xb569a6e5, 0x36eadd21),
+        PCMCIA_DEVICE_PROD_ID12("IBM", "4MB FLASH", 0xb569a6e5, 0x8bc54d2a),
+        PCMCIA_DEVICE_PROD_ID12("IBM", "8MB FLASH", 0xb569a6e5, 0x6df1be3e),
+        PCMCIA_DEVICE_PROD_ID12("Intel", "S2E20SW", 0x816cc815, 0xd14c9dcf),
+        PCMCIA_DEVICE_PROD_ID12("Intel", "S2E8 SW", 0x816cc815, 0xa2d7dedb),
+        PCMCIA_DEVICE_PROD_ID12("intel", "SERIES2-02 ", 0x40ade711, 0x145cea5c),
+        PCMCIA_DEVICE_PROD_ID12("intel", "SERIES2-04 ", 0x40ade711, 0x42064dda),
+        PCMCIA_DEVICE_PROD_ID12("intel", "SERIES2-20 ", 0x40ade711, 0x25ee5cb0),
+        PCMCIA_DEVICE_PROD_ID12("intel", "VALUE SERIES 100 ", 0x40ade711, 0xdf8506d8),
+        PCMCIA_DEVICE_PROD_ID12("KINGMAX TECHNOLOGY INC.", "SRAM 256K Bytes", 0x54d0c69c, 0xad12c29c),
+        PCMCIA_DEVICE_PROD_ID12("Maxtor", "MAXFL MobileMax Flash Memory Card", 0xb68968c8, 0x2dfb47b0),
+        PCMCIA_DEVICE_PROD_ID12("SEIKO EPSON", "WWB101EN20", 0xf9876baf, 0xad0b207b),
+        PCMCIA_DEVICE_PROD_ID12("SEIKO EPSON", "WWB513EN20", 0xf9876baf, 0xe8d884ad),
+        PCMCIA_DEVICE_PROD_ID12("Starfish, Inc.", "REX-3000", 0x05ddca47, 0xe7d67bca),
+        PCMCIA_DEVICE_PROD_ID12("Starfish, Inc.", "REX-4100", 0x05ddca47, 0x7bc32944),
+        /* the following was commented out in pcmcia-cs-3.2.7 */
+        /* PCMCIA_DEVICE_PROD_ID12("RATOC Systems,Inc.", "SmartMedia ADAPTER PC Card", 0xf4a2fefe, 0x5885b2ae), */
+#ifdef CONFIG_MTD_PCMCIA_ANONYMOUS
+        { .match_flags = PCMCIA_DEV_ID_MATCH_ANONYMOUS, },
+#endif
+        PCMCIA_DEVICE_NULL
+};
+MODULE_DEVICE_TABLE(pcmcia, pcmciamtd_ids);
 
 static struct pcmcia_driver pcmciamtd_driver = {
         .drv            = {
@@ -825,7 +851,8 @@ static struct pcmcia_driver pcmciamtd_driver = {
         },
         .attach         = pcmciamtd_attach,
         .detach         = pcmciamtd_detach,
-        .owner          = THIS_MODULE
+        .owner          = THIS_MODULE,
+        .id_table       = pcmciamtd_ids,
 };