kernel: 2.6.32: integrate m25p80 driver related patches from ar71xx
SVN-Revision: 19547
This commit is contained in:
parent
c25bf09111
commit
d2cd6f3b99
8 changed files with 3 additions and 3 deletions
|
@ -1,6 +1,6 @@
|
|||
--- a/drivers/mtd/devices/m25p80.c
|
||||
+++ b/drivers/mtd/devices/m25p80.c
|
||||
@@ -856,6 +856,16 @@ static int __devinit m25p_probe(struct s
|
||||
@@ -867,6 +867,16 @@ static int __devinit m25p_probe(struct s
|
||||
part_probes, &parts, 0);
|
||||
}
|
||||
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- a/drivers/mtd/devices/m25p80.c
|
||||
+++ b/drivers/mtd/devices/m25p80.c
|
||||
@@ -870,6 +870,15 @@ static int __devinit m25p_probe(struct s
|
||||
@@ -877,6 +877,15 @@ static int __devinit m25p_probe(struct s
|
||||
}
|
||||
#endif
|
||||
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- a/drivers/mtd/devices/m25p80.c
|
||||
+++ b/drivers/mtd/devices/m25p80.c
|
||||
@@ -885,6 +885,16 @@ static int __devinit m25p_probe(struct s
|
||||
@@ -886,6 +886,16 @@ static int __devinit m25p_probe(struct s
|
||||
part_probes, &parts, 0);
|
||||
}
|
||||
#endif
|
||||
|
|
Loading…
Reference in a new issue