diff options
| author | hauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-04-18 18:35:47 +0000 |
|---|---|---|
| committer | hauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-04-18 18:35:47 +0000 |
| commit | af3243b5d52fcd97a24dfc6e28d8ac4d4c7bfdc3 (patch) | |
| tree | c752890e176316502ae064e00342c64d54ffc8c8 /target/linux/generic-2.6/patches-2.6.34/086-mtd_m25p80_add_xxxs33b_support.patch | |
| parent | 0fe492d30bcc484623460c11948831aabc055cbf (diff) | |
kernel: refresh patches with 2.6.34-rc4
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@20999 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic-2.6/patches-2.6.34/086-mtd_m25p80_add_xxxs33b_support.patch')
| -rw-r--r-- | target/linux/generic-2.6/patches-2.6.34/086-mtd_m25p80_add_xxxs33b_support.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.34/086-mtd_m25p80_add_xxxs33b_support.patch b/target/linux/generic-2.6/patches-2.6.34/086-mtd_m25p80_add_xxxs33b_support.patch index 2f6d89927..293ed8bdb 100644 --- a/target/linux/generic-2.6/patches-2.6.34/086-mtd_m25p80_add_xxxs33b_support.patch +++ b/target/linux/generic-2.6/patches-2.6.34/086-mtd_m25p80_add_xxxs33b_support.patch @@ -1,6 +1,6 @@ --- a/drivers/mtd/devices/m25p80.c +++ b/drivers/mtd/devices/m25p80.c -@@ -649,6 +649,11 @@ static const struct spi_device_id m25p_i +@@ -650,6 +650,11 @@ static const struct spi_device_id m25p_i { "en25p32", INFO(0x1c2016, 0, 64 * 1024, 64, 0) }, { "en25p64", INFO(0x1c2017, 0, 64 * 1024, 128, 0) }, @@ -12,7 +12,7 @@ /* PMC -- pm25x "blocks" are 32K, sectors are 4K */ { "pm25lv512", INFO(0, 0, 32 * 1024, 2, SECT_4K) }, { "pm25lv010", INFO(0, 0, 32 * 1024, 4, SECT_4K) }, -@@ -833,11 +838,12 @@ static int __devinit m25p_probe(struct s +@@ -834,11 +839,12 @@ static int __devinit m25p_probe(struct s dev_set_drvdata(&spi->dev, flash); /* |