refresh 2.6.28 patches
SVN-Revision: 15419
This commit is contained in:
parent
d56fcbd853
commit
f83c011d77
@ -1,25 +1,27 @@
|
|||||||
--- a/drivers/usb/host/Kconfig
|
--- a/drivers/usb/host/Kconfig
|
||||||
+++ b/drivers/usb/host/Kconfig
|
+++ b/drivers/usb/host/Kconfig
|
||||||
@@ -81,6 +81,12 @@ config USB_EHCI_BIG_ENDIAN_DESC
|
@@ -81,6 +81,13 @@ config USB_EHCI_BIG_ENDIAN_DESC
|
||||||
depends on USB_EHCI_HCD && (440EPX || ARCH_IXP4XX)
|
depends on USB_EHCI_HCD && (440EPX || ARCH_IXP4XX)
|
||||||
default y
|
default y
|
||||||
|
|
||||||
+config USB_EHCI_AR71XX
|
+config USB_EHCI_AR71XX
|
||||||
+ bool "USB EHCI support for AR71xx"
|
+ bool "USB EHCI support for AR71xx"
|
||||||
+ depends on USB_EHCI_HCD && ATHEROS_AR71XX
|
+ depends on USB_EHCI_HCD && ATHEROS_AR71XX
|
||||||
|
+ default y
|
||||||
+ help
|
+ help
|
||||||
+ Support for Atheros AR71xx built-in EHCI controller
|
+ Support for Atheros AR71xx built-in EHCI controller
|
||||||
+
|
+
|
||||||
config USB_EHCI_FSL
|
config USB_EHCI_FSL
|
||||||
bool "Support for Freescale on-chip EHCI USB controller"
|
bool "Support for Freescale on-chip EHCI USB controller"
|
||||||
depends on USB_EHCI_HCD && FSL_SOC
|
depends on USB_EHCI_HCD && FSL_SOC
|
||||||
@@ -140,6 +146,12 @@ config USB_OHCI_HCD
|
@@ -140,6 +147,13 @@ config USB_OHCI_HCD
|
||||||
To compile this driver as a module, choose M here: the
|
To compile this driver as a module, choose M here: the
|
||||||
module will be called ohci-hcd.
|
module will be called ohci-hcd.
|
||||||
|
|
||||||
+config USB_OHCI_AR71XX
|
+config USB_OHCI_AR71XX
|
||||||
+ bool "USB OHCI support for Atheros AR71xx"
|
+ bool "USB OHCI support for Atheros AR71xx"
|
||||||
+ depends on USB_OHCI_HCD && ATHEROS_AR71XX
|
+ depends on USB_OHCI_HCD && ATHEROS_AR71XX
|
||||||
|
+ default y
|
||||||
+ help
|
+ help
|
||||||
+ Support for Atheros AR71xx built-in OHCI controller
|
+ Support for Atheros AR71xx built-in OHCI controller
|
||||||
+
|
+
|
||||||
|
@ -1,8 +1,8 @@
|
|||||||
--- a/drivers/net/phy/Kconfig
|
--- a/drivers/net/phy/Kconfig
|
||||||
+++ b/drivers/net/phy/Kconfig
|
+++ b/drivers/net/phy/Kconfig
|
||||||
@@ -80,6 +80,11 @@ config ADM6996_PHY
|
@@ -84,6 +84,11 @@ config IP175C_PHY
|
||||||
config MVSWITCH_PHY
|
tristate "Driver for IC+ IP175C/IP178C switches"
|
||||||
tristate "Driver for Marvell 88E6060 switches"
|
select SWCONFIG
|
||||||
|
|
||||||
+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
|
||||||
@@ -16,6 +16,7 @@ obj-$(CONFIG_ICPLUS_PHY) += icplus.o
|
@@ -17,6 +17,7 @@ obj-$(CONFIG_ADM6996_PHY) += adm6996.o
|
||||||
obj-$(CONFIG_ADM6996_PHY) += adm6996.o
|
|
||||||
obj-$(CONFIG_MVSWITCH_PHY) += mvswitch.o
|
obj-$(CONFIG_MVSWITCH_PHY) += mvswitch.o
|
||||||
|
obj-$(CONFIG_IP175C_PHY) += ip175c.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 New Issue
Block a user