From: Gabor Juhos <juhosg@openwrt.org>
Date: Tue, 25 Jan 2011 10:24:27 +0000 (+0000)
Subject: generic: remove en25pxx support patch, it is in mainline since 2.6.36
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=62e8fbd7ae82aead2ba6a7cbd591df6bb4fc9445;p=openwrt%2Fstaging%2Faparcar.git

generic: remove en25pxx support patch, it is in mainline since 2.6.36

SVN-Revision: 25097
---

diff --git a/target/linux/generic/patches-2.6.36/085-mtd_m25p80_add_en25pxx_support.patch b/target/linux/generic/patches-2.6.36/085-mtd_m25p80_add_en25pxx_support.patch
deleted file mode 100644
index df2974cc0a..0000000000
--- a/target/linux/generic/patches-2.6.36/085-mtd_m25p80_add_en25pxx_support.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/drivers/mtd/devices/m25p80.c
-+++ b/drivers/mtd/devices/m25p80.c
-@@ -656,6 +656,10 @@ static const struct spi_device_id m25p_i
- 	{ "mx25l12805d", INFO(0xc22018, 0, 64 * 1024, 256, 0) },
- 	{ "mx25l12855e", INFO(0xc22618, 0, 64 * 1024, 256, 0) },
- 
-+	/* EON -- en25pxx */
-+	{ "en25p32", INFO(0x1c2016, 0, 64 * 1024,  64, 0) },
-+	{ "en25p64", INFO(0x1c2017, 0, 64 * 1024, 128, 0) },
-+
- 	/* PMC -- pm25x "blocks" are 32K, sectors are 4K */
- 	{ "pm25lv512", INFO(0, 0, 32 * 1024, 2, SECT_4K_PMC) },
- 	{ "pm25lv010", INFO(0, 0, 32 * 1024, 4, SECT_4K_PMC) },
diff --git a/target/linux/generic/patches-2.6.36/090-mtd-m25p80-add-en25f32-chip-support.patch b/target/linux/generic/patches-2.6.36/090-mtd-m25p80-add-en25f32-chip-support.patch
index 5de170dfee..19e3e5c038 100644
--- a/target/linux/generic/patches-2.6.36/090-mtd-m25p80-add-en25f32-chip-support.patch
+++ b/target/linux/generic/patches-2.6.36/090-mtd-m25p80-add-en25f32-chip-support.patch
@@ -1,8 +1,8 @@
 --- a/drivers/mtd/devices/m25p80.c
 +++ b/drivers/mtd/devices/m25p80.c
-@@ -656,7 +656,8 @@ static const struct spi_device_id m25p_i
- 	{ "mx25l12805d", INFO(0xc22018, 0, 64 * 1024, 256, 0) },
- 	{ "mx25l12855e", INFO(0xc22618, 0, 64 * 1024, 256, 0) },
+@@ -639,7 +639,8 @@ static const struct spi_device_id m25p_i
+ 	{ "at26df161a", INFO(0x1f4601, 0, 64 * 1024, 32, SECT_4K) },
+ 	{ "at26df321",  INFO(0x1f4701, 0, 64 * 1024, 64, SECT_4K) },
  
 -	/* EON -- en25pxx */
 +	/* EON -- en25xxx */
diff --git a/target/linux/generic/patches-2.6.37/085-mtd_m25p80_add_en25pxx_support.patch b/target/linux/generic/patches-2.6.37/085-mtd_m25p80_add_en25pxx_support.patch
deleted file mode 100644
index df2974cc0a..0000000000
--- a/target/linux/generic/patches-2.6.37/085-mtd_m25p80_add_en25pxx_support.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/drivers/mtd/devices/m25p80.c
-+++ b/drivers/mtd/devices/m25p80.c
-@@ -656,6 +656,10 @@ static const struct spi_device_id m25p_i
- 	{ "mx25l12805d", INFO(0xc22018, 0, 64 * 1024, 256, 0) },
- 	{ "mx25l12855e", INFO(0xc22618, 0, 64 * 1024, 256, 0) },
- 
-+	/* EON -- en25pxx */
-+	{ "en25p32", INFO(0x1c2016, 0, 64 * 1024,  64, 0) },
-+	{ "en25p64", INFO(0x1c2017, 0, 64 * 1024, 128, 0) },
-+
- 	/* PMC -- pm25x "blocks" are 32K, sectors are 4K */
- 	{ "pm25lv512", INFO(0, 0, 32 * 1024, 2, SECT_4K_PMC) },
- 	{ "pm25lv010", INFO(0, 0, 32 * 1024, 4, SECT_4K_PMC) },
diff --git a/target/linux/generic/patches-2.6.37/090-mtd-m25p80-add-en25f32-chip-support.patch b/target/linux/generic/patches-2.6.37/090-mtd-m25p80-add-en25f32-chip-support.patch
index 5de170dfee..19e3e5c038 100644
--- a/target/linux/generic/patches-2.6.37/090-mtd-m25p80-add-en25f32-chip-support.patch
+++ b/target/linux/generic/patches-2.6.37/090-mtd-m25p80-add-en25f32-chip-support.patch
@@ -1,8 +1,8 @@
 --- a/drivers/mtd/devices/m25p80.c
 +++ b/drivers/mtd/devices/m25p80.c
-@@ -656,7 +656,8 @@ static const struct spi_device_id m25p_i
- 	{ "mx25l12805d", INFO(0xc22018, 0, 64 * 1024, 256, 0) },
- 	{ "mx25l12855e", INFO(0xc22618, 0, 64 * 1024, 256, 0) },
+@@ -639,7 +639,8 @@ static const struct spi_device_id m25p_i
+ 	{ "at26df161a", INFO(0x1f4601, 0, 64 * 1024, 32, SECT_4K) },
+ 	{ "at26df321",  INFO(0x1f4701, 0, 64 * 1024, 64, SECT_4K) },
  
 -	/* EON -- en25pxx */
 +	/* EON -- en25xxx */
diff --git a/target/linux/generic/patches-2.6.38/085-mtd_m25p80_add_en25pxx_support.patch b/target/linux/generic/patches-2.6.38/085-mtd_m25p80_add_en25pxx_support.patch
deleted file mode 100644
index 1edc5b73a5..0000000000
--- a/target/linux/generic/patches-2.6.38/085-mtd_m25p80_add_en25pxx_support.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/drivers/mtd/devices/m25p80.c
-+++ b/drivers/mtd/devices/m25p80.c
-@@ -676,6 +676,10 @@ static const struct spi_device_id m25p_i
- 	{ "mx25l25635e", INFO(0xc22019, 0, 64 * 1024, 512, 0) },
- 	{ "mx25l25655e", INFO(0xc22619, 0, 64 * 1024, 512, 0) },
- 
-+	/* EON -- en25pxx */
-+	{ "en25p32", INFO(0x1c2016, 0, 64 * 1024,  64, 0) },
-+	{ "en25p64", INFO(0x1c2017, 0, 64 * 1024, 128, 0) },
-+
- 	/* PMC -- pm25x "blocks" are 32K, sectors are 4K */
- 	{ "pm25lv512", INFO(0, 0, 32 * 1024, 2, SECT_4K_PMC) },
- 	{ "pm25lv010", INFO(0, 0, 32 * 1024, 4, SECT_4K_PMC) },