refresh patches
SVN-Revision: 16168
This commit is contained in:
parent
63fdd1a743
commit
9252651252
7 changed files with 12 additions and 12 deletions
|
@ -1,6 +1,6 @@
|
|||
--- a/drivers/mtd/devices/m25p80.c
|
||||
+++ b/drivers/mtd/devices/m25p80.c
|
||||
@@ -721,6 +721,9 @@ static int __devinit m25p_probe(struct s
|
||||
@@ -722,6 +722,9 @@ static int __devinit m25p_probe(struct s
|
||||
#ifdef CONFIG_MTD_MYLOADER_PARTS
|
||||
"MyLoader",
|
||||
#endif
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
--- a/drivers/mtd/devices/m25p80.c
|
||||
+++ b/drivers/mtd/devices/m25p80.c
|
||||
@@ -506,6 +506,11 @@ static struct flash_info __devinitdata m
|
||||
/* EON -- en25px */
|
||||
{ "en25p32", 0x1c2016, 0, 64 * 1024, 64, },
|
||||
@@ -507,6 +507,11 @@ static struct flash_info __devinitdata m
|
||||
{ "en25p32", 0x1c2016, 0, 64 * 1024, 64, },
|
||||
{ "en25p64", 0x1c2017, 0, 64 * 1024, 128, },
|
||||
|
||||
+ /* Macronix -- mx25lxxx */
|
||||
+ { "mx25l32", 0xc22016, 0, 64 * 1024, 64, },
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- a/drivers/mtd/devices/m25p80.c
|
||||
+++ b/drivers/mtd/devices/m25p80.c
|
||||
@@ -511,6 +511,11 @@ static struct flash_info __devinitdata m
|
||||
@@ -512,6 +512,11 @@ static struct flash_info __devinitdata m
|
||||
{ "mx25l64", 0xc22017, 0, 64 * 1024, 128, },
|
||||
{ "mx25l128", 0xc22018, 0, 64 * 1024, 256, },
|
||||
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- a/drivers/mtd/devices/m25p80.c
|
||||
+++ b/drivers/mtd/devices/m25p80.c
|
||||
@@ -731,6 +731,15 @@ static int __devinit m25p_probe(struct s
|
||||
@@ -732,6 +732,15 @@ static int __devinit m25p_probe(struct s
|
||||
}
|
||||
#endif
|
||||
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
--- a/drivers/mtd/devices/m25p80.c
|
||||
+++ b/drivers/mtd/devices/m25p80.c
|
||||
@@ -503,6 +503,11 @@ static struct flash_info __devinitdata m
|
||||
/* EON -- en25px */
|
||||
{ "en25p32", 0x1c2016, 0, 64 * 1024, 64, },
|
||||
@@ -504,6 +504,11 @@ static struct flash_info __devinitdata m
|
||||
{ "en25p32", 0x1c2016, 0, 64 * 1024, 64, },
|
||||
{ "en25p64", 0x1c2017, 0, 64 * 1024, 128, },
|
||||
|
||||
+ /* Macronix -- mx25lxxx */
|
||||
+ { "mx25l32", 0xc22016, 0, 64 * 1024, 64, },
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- a/drivers/mtd/devices/m25p80.c
|
||||
+++ b/drivers/mtd/devices/m25p80.c
|
||||
@@ -508,6 +508,11 @@ static struct flash_info __devinitdata m
|
||||
@@ -509,6 +509,11 @@ static struct flash_info __devinitdata m
|
||||
{ "mx25l64", 0xc22017, 0, 64 * 1024, 128, },
|
||||
{ "mx25l128", 0xc22018, 0, 64 * 1024, 256, },
|
||||
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- a/arch/mips/ar71xx/devices.c
|
||||
+++ b/arch/mips/ar71xx/devices.c
|
||||
@@ -655,6 +655,8 @@ static struct platform_device ar71xx_dsa
|
||||
@@ -753,6 +753,8 @@ static struct platform_device ar71xx_dsa
|
||||
void __init ar71xx_add_device_dsa(unsigned int id,
|
||||
struct dsa_platform_data *d)
|
||||
{
|
||||
|
@ -9,7 +9,7 @@
|
|||
switch (id) {
|
||||
case 0:
|
||||
d->netdev = &ar71xx_eth0_device.dev;
|
||||
@@ -668,7 +670,10 @@ void __init ar71xx_add_device_dsa(unsign
|
||||
@@ -766,7 +768,10 @@ void __init ar71xx_add_device_dsa(unsign
|
||||
id);
|
||||
return;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue