refresh patches

SVN-Revision: 30777
This commit is contained in:
Florian Fainelli 2012-03-02 13:18:47 +00:00
parent 6c61d7cbf1
commit c25f266680
7 changed files with 14 additions and 13 deletions

View file

@ -1,6 +1,6 @@
--- a/drivers/mtd/devices/block2mtd.c --- a/drivers/mtd/devices/block2mtd.c
+++ b/drivers/mtd/devices/block2mtd.c +++ b/drivers/mtd/devices/block2mtd.c
@@ -264,10 +264,12 @@ static int _open_bdev(struct block2mtd_d @@ -264,11 +264,13 @@ static int _open_bdev(struct block2mtd_d
bdev = open_bdev_exclusive(dev->devname, FMODE_READ|FMODE_WRITE, NULL); bdev = open_bdev_exclusive(dev->devname, FMODE_READ|FMODE_WRITE, NULL);
#ifndef MODULE #ifndef MODULE
if (IS_ERR(bdev)) { if (IS_ERR(bdev)) {
@ -9,8 +9,9 @@
/* We might not have rootfs mounted at this point. Try /* We might not have rootfs mounted at this point. Try
to resolve the device name by other means. */ to resolve the device name by other means. */
+ wait_for_device_probe();
- dev_t devt = name_to_dev_t(dev->devname); - dev_t devt = name_to_dev_t(dev->devname);
+ wait_for_device_probe();
+ devt = name_to_dev_t(dev->devname); + devt = name_to_dev_t(dev->devname);
if (devt) { if (devt) {
bdev = open_by_devnum(devt, FMODE_WRITE | FMODE_READ); bdev = open_by_devnum(devt, FMODE_WRITE | FMODE_READ);
}

View file

@ -1,8 +1,8 @@
--- a/drivers/net/phy/Kconfig --- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig +++ b/drivers/net/phy/Kconfig
@@ -99,6 +99,9 @@ config ADM6996_PHY @@ -101,6 +101,9 @@ config ADM6996_PHY
---help--- Currently supports the ADM6996FC and ADM6996M switches.
Currently supports the ADM6996F switch Support for FC is very limited.
+config MVSWITCH_PHY +config MVSWITCH_PHY
+ tristate "Driver for Marvell 88E6060 switches" + tristate "Driver for Marvell 88E6060 switches"

View file

@ -1,6 +1,6 @@
--- a/drivers/net/phy/Kconfig --- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig +++ b/drivers/net/phy/Kconfig
@@ -102,6 +102,10 @@ config ADM6996_PHY @@ -104,6 +104,10 @@ config ADM6996_PHY
config MVSWITCH_PHY config MVSWITCH_PHY
tristate "Driver for Marvell 88E6060 switches" tristate "Driver for Marvell 88E6060 switches"

View file

@ -1,6 +1,6 @@
--- a/drivers/net/phy/Kconfig --- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig +++ b/drivers/net/phy/Kconfig
@@ -106,6 +106,10 @@ config IP17XX_PHY @@ -108,6 +108,10 @@ config IP17XX_PHY
tristate "Driver for IC+ IP17xx switches" tristate "Driver for IC+ IP17xx switches"
select SWCONFIG select SWCONFIG

View file

@ -1,6 +1,6 @@
--- a/drivers/net/phy/Kconfig --- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig +++ b/drivers/net/phy/Kconfig
@@ -110,6 +110,10 @@ config AR8216_PHY @@ -112,6 +112,10 @@ config AR8216_PHY
tristate "Driver for Atheros AR8216 switches" tristate "Driver for Atheros AR8216 switches"
select SWCONFIG select SWCONFIG

View file

@ -1,6 +1,6 @@
--- a/drivers/net/phy/Kconfig --- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig +++ b/drivers/net/phy/Kconfig
@@ -141,4 +141,29 @@ config MDIO_GPIO @@ -143,4 +143,29 @@ config MDIO_GPIO
To compile this driver as a module, choose M here: the module To compile this driver as a module, choose M here: the module
will be called mdio-gpio. will be called mdio-gpio.