refresh kernel patches
SVN-Revision: 15347
This commit is contained in:
parent
7a0c00a011
commit
90cd9b70a3
2 changed files with 6 additions and 6 deletions
|
@ -28,7 +28,7 @@
|
||||||
depends on USB_OHCI_HCD && (STB03xxx || PPC_MPC52xx)
|
depends on USB_OHCI_HCD && (STB03xxx || PPC_MPC52xx)
|
||||||
--- a/drivers/usb/host/ehci-hcd.c
|
--- a/drivers/usb/host/ehci-hcd.c
|
||||||
+++ b/drivers/usb/host/ehci-hcd.c
|
+++ b/drivers/usb/host/ehci-hcd.c
|
||||||
@@ -1034,6 +1034,11 @@ MODULE_LICENSE ("GPL");
|
@@ -1036,6 +1036,11 @@ MODULE_LICENSE ("GPL");
|
||||||
#define PLATFORM_DRIVER ixp4xx_ehci_driver
|
#define PLATFORM_DRIVER ixp4xx_ehci_driver
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
--- a/drivers/net/phy/Kconfig
|
--- a/drivers/net/phy/Kconfig
|
||||||
+++ b/drivers/net/phy/Kconfig
|
+++ b/drivers/net/phy/Kconfig
|
||||||
@@ -77,6 +77,11 @@ config ADM6996_PHY
|
@@ -80,6 +80,11 @@ config ADM6996_PHY
|
||||||
---help---
|
config MVSWITCH_PHY
|
||||||
Currently supports the ADM6996F switch
|
tristate "Driver for Marvell 88E6060 switches"
|
||||||
|
|
||||||
+config MICREL_PHY
|
+config MICREL_PHY
|
||||||
+ tristate "Drivers for Micrel/Kendin PHYs"
|
+ tristate "Drivers for Micrel/Kendin PHYs"
|
||||||
|
@ -14,9 +14,9 @@
|
||||||
depends on PHYLIB=y
|
depends on PHYLIB=y
|
||||||
--- a/drivers/net/phy/Makefile
|
--- a/drivers/net/phy/Makefile
|
||||||
+++ b/drivers/net/phy/Makefile
|
+++ b/drivers/net/phy/Makefile
|
||||||
@@ -15,6 +15,7 @@ obj-$(CONFIG_BROADCOM_PHY) += broadcom.o
|
@@ -16,6 +16,7 @@ obj-$(CONFIG_ICPLUS_PHY) += icplus.o
|
||||||
obj-$(CONFIG_ICPLUS_PHY) += icplus.o
|
|
||||||
obj-$(CONFIG_ADM6996_PHY) += adm6996.o
|
obj-$(CONFIG_ADM6996_PHY) += adm6996.o
|
||||||
|
obj-$(CONFIG_MVSWITCH_PHY) += mvswitch.o
|
||||||
obj-$(CONFIG_REALTEK_PHY) += realtek.o
|
obj-$(CONFIG_REALTEK_PHY) += realtek.o
|
||||||
+obj-$(CONFIG_MICREL_PHY) += micrel.o
|
+obj-$(CONFIG_MICREL_PHY) += micrel.o
|
||||||
obj-$(CONFIG_FIXED_PHY) += fixed.o
|
obj-$(CONFIG_FIXED_PHY) += fixed.o
|
||||||
|
|
Loading…
Reference in a new issue