Merge git://git.infradead.org/mtd-2.6

[mv-sheeva.git] / drivers / mtd / devices / m25p80.c

diff --git a/drivers/mtd/devices/m25p80.c b/drivers/mtd/devices/m25p80.c
index 53de9f05ad50d5835c0dad41f337795acc50fd6a..379c316f329eb0d054718a12ed1c9111845d68db 100644 (file)
--- a/drivers/mtd/devices/m25p80.c
+++ b/drivers/mtd/devices/m25p80.c
@@ -633,14 +633,20 @@ static struct flash_info __devinitdata m25p_data [] = {
        { "s25sl016a", 0x010214, 0, 64 * 1024, 32, },
        { "s25sl032a", 0x010215, 0, 64 * 1024, 64, },
        { "s25sl064a", 0x010216, 0, 64 * 1024, 128, },
-        { "s25sl12800", 0x012018, 0x0300, 256 * 1024, 64, },
+       { "s25sl12800", 0x012018, 0x0300, 256 * 1024, 64, },
        { "s25sl12801", 0x012018, 0x0301, 64 * 1024, 256, },
+       { "s25fl129p0", 0x012018, 0x4d00, 256 * 1024, 64, },
+       { "s25fl129p1", 0x012018, 0x4d01, 64 * 1024, 256, },
 
        /* SST -- large erase sizes are "overlays", "sectors" are 4K */
        { "sst25vf040b", 0xbf258d, 0, 64 * 1024, 8, SECT_4K, },
        { "sst25vf080b", 0xbf258e, 0, 64 * 1024, 16, SECT_4K, },
        { "sst25vf016b", 0xbf2541, 0, 64 * 1024, 32, SECT_4K, },
        { "sst25vf032b", 0xbf254a, 0, 64 * 1024, 64, SECT_4K, },
+       { "sst25wf512",  0xbf2501, 0, 64 * 1024, 1, SECT_4K, },
+       { "sst25wf010",  0xbf2502, 0, 64 * 1024, 2, SECT_4K, },
+       { "sst25wf020",  0xbf2503, 0, 64 * 1024, 4, SECT_4K, },
+       { "sst25wf040",  0xbf2504, 0, 64 * 1024, 8, SECT_4K, },
 
        /* ST Microelectronics -- newer production may have feature updates */
        { "m25p05",  0x202010,  0, 32 * 1024, 2, },
@@ -903,13 +909,13 @@ static struct spi_driver m25p80_driver = {
 };
 
 
-static int m25p80_init(void)
+static int __init m25p80_init(void)
 {
        return spi_register_driver(&m25p80_driver);
 }
 
 
-static void m25p80_exit(void)
+static void __exit m25p80_exit(void)
 {
        spi_unregister_driver(&m25p80_driver);
 }