diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2013-02-25 21:28:38 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2013-02-25 21:28:38 +0000 |
| commit | 275db5b4c4c78d3036cb56b3686650d62c1f5733 (patch) | |
| tree | 06314c4438b065d94b92626f5c574511f15bccde /target | |
| parent | 5e1d6ce0775a2acb3832d064d7ac175d12abd01f (diff) | |
| download | upstream-275db5b4c4c78d3036cb56b3686650d62c1f5733.tar.gz upstream-275db5b4c4c78d3036cb56b3686650d62c1f5733.tar.bz2 upstream-275db5b4c4c78d3036cb56b3686650d62c1f5733.zip | |
ramips: remove port_power_off field from ehci_platform_data
It is removed in 3.8. Also add a revert patch for 3.7.
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
SVN-Revision: 35799
Diffstat (limited to 'target')
3 files changed, 22 insertions, 2 deletions
diff --git a/target/linux/ramips/files/arch/mips/ralink/rt305x/devices.c b/target/linux/ramips/files/arch/mips/ralink/rt305x/devices.c index 42429b791e..f16ba6d5f1 100644 --- a/target/linux/ramips/files/arch/mips/ralink/rt305x/devices.c +++ b/target/linux/ramips/files/arch/mips/ralink/rt305x/devices.c @@ -356,7 +356,6 @@ static void rt3352_usb_power_off(struct platform_device *pdev) } static struct usb_ehci_pdata rt3352_ehci_data = { - .port_power_off = 1, .power_on = rt3352_usb_power_on, .power_off = rt3352_usb_power_off, }; diff --git a/target/linux/ramips/files/arch/mips/ralink/rt3883/devices.c b/target/linux/ramips/files/arch/mips/ralink/rt3883/devices.c index 3a1bf26333..6077e97dda 100644 --- a/target/linux/ramips/files/arch/mips/ralink/rt3883/devices.c +++ b/target/linux/ramips/files/arch/mips/ralink/rt3883/devices.c @@ -177,7 +177,6 @@ static void rt3883_usb_power_off(struct platform_device *pdev) } static struct usb_ehci_pdata rt3883_ehci_data = { - .port_power_off = 1, .power_on = rt3883_usb_power_on, .power_off = rt3883_usb_power_off, }; diff --git a/target/linux/ramips/patches-3.7/a01-revert-ehci-port_power_off-removal.patch b/target/linux/ramips/patches-3.7/a01-revert-ehci-port_power_off-removal.patch new file mode 100644 index 0000000000..ad2645a12d --- /dev/null +++ b/target/linux/ramips/patches-3.7/a01-revert-ehci-port_power_off-removal.patch @@ -0,0 +1,22 @@ +reverted: +--- a/arch/mips/ralink/rt3883/devices.c ++++ b/arch/mips/ralink/rt3883/devices.c +@@ -177,6 +177,7 @@ + } + + static struct usb_ehci_pdata rt3883_ehci_data = { ++ .port_power_off = 1, + .power_on = rt3883_usb_power_on, + .power_off = rt3883_usb_power_off, + }; +reverted: +--- b/arch/mips/ralink/rt305x/devices.c ++++ a/arch/mips/ralink/rt305x/devices.c +@@ -356,6 +356,7 @@ + } + + static struct usb_ehci_pdata rt3352_ehci_data = { ++ .port_power_off = 1, + .power_on = rt3352_usb_power_on, + .power_off = rt3352_usb_power_off, + }; |