--- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
-@@ -88,6 +88,11 @@ config AR8216_PHY
- tristate "Driver for Atheros AR8216 switches"
+@@ -92,6 +92,11 @@ config RTL8306_PHY
+ tristate "Driver for Realtek RTL8306S switches"
select SWCONFIG
+config MICREL_PHY
depends on PHYLIB=y
--- a/drivers/net/phy/Makefile
+++ b/drivers/net/phy/Makefile
-@@ -18,6 +18,7 @@ obj-$(CONFIG_MVSWITCH_PHY) += mvswitch.o
- obj-$(CONFIG_IP175C_PHY) += ip175c.o
+@@ -19,6 +19,7 @@ obj-$(CONFIG_IP175C_PHY) += ip175c.o
obj-$(CONFIG_AR8216_PHY) += ar8216.o
+ obj-$(CONFIG_RTL8306_PHY) += rtl8306.o
obj-$(CONFIG_REALTEK_PHY) += realtek.o
+obj-$(CONFIG_MICREL_PHY) += micrel.o
obj-$(CONFIG_FIXED_PHY) += fixed.o
depends on USB_OHCI_HCD && (STB03xxx || PPC_MPC52xx)
--- a/drivers/usb/host/ehci-hcd.c
+++ b/drivers/usb/host/ehci-hcd.c
-@@ -1072,6 +1072,11 @@ MODULE_LICENSE ("GPL");
+@@ -1075,6 +1075,11 @@ MODULE_LICENSE ("GPL");
#define PLATFORM_DRIVER ixp4xx_ehci_driver
#endif
--- a/drivers/usb/host/ehci-q.c
+++ b/drivers/usb/host/ehci-q.c
-@@ -1082,6 +1082,9 @@ static void end_unlink_async (struct ehc
+@@ -1127,6 +1127,9 @@ static void end_unlink_async (struct ehc
ehci->reclaim = NULL;
start_unlink_async (ehci, next);
}
--- a/arch/mips/ar71xx/devices.c
+++ b/arch/mips/ar71xx/devices.c
-@@ -792,6 +792,8 @@ static struct platform_device ar71xx_dsa
+@@ -790,6 +790,8 @@ static struct platform_device ar71xx_dsa
void __init ar71xx_add_device_dsa(unsigned int id,
struct dsa_platform_data *d)
{
switch (id) {
case 0:
d->netdev = &ar71xx_eth0_device.dev;
-@@ -805,7 +807,10 @@ void __init ar71xx_add_device_dsa(unsign
+@@ -803,7 +805,10 @@ void __init ar71xx_add_device_dsa(unsign
id);
return;
}
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
-@@ -2101,6 +2101,8 @@ config ACENIC_OMIT_TIGON_I
+@@ -2103,6 +2103,8 @@ config ACENIC_OMIT_TIGON_I
The safe and default value for this is N.
--- a/arch/mips/ar71xx/devices.c
+++ b/arch/mips/ar71xx/devices.c
-@@ -792,6 +792,8 @@ static struct platform_device ar71xx_dsa
+@@ -790,6 +790,8 @@ static struct platform_device ar71xx_dsa
void __init ar71xx_add_device_dsa(unsigned int id,
struct dsa_platform_data *d)
{
switch (id) {
case 0:
d->netdev = &ar71xx_eth0_device.dev;
-@@ -805,7 +807,10 @@ void __init ar71xx_add_device_dsa(unsign
+@@ -803,7 +805,10 @@ void __init ar71xx_add_device_dsa(unsign
id);
return;
}