From 6247141e7835a4bbf5850c9e94ae8c9a61eb20cf Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Sat, 26 Sep 2009 11:42:43 +0000 Subject: [PATCH] refresh patches SVN-Revision: 17733 --- .../patches-2.6.28/130-remove_scache.patch | 2 +- .../patches-2.6.28/250-ohci-ssb-usb2.patch | 4 ++-- .../patches-2.6.28/260-ohci-set-dma-mask.patch | 4 ++-- .../brcm47xx/patches-2.6.28/270-ehci-ssb.patch | 14 +++++++------- .../patches-2.6.28/275-usb2-bcm5354-init.patch | 4 ++-- .../280-activate_ssb_support_in_usb.patch | 4 ++-- .../patches-2.6.30/130-remove_scache.patch | 2 +- .../patches-2.6.30/250-ohci-ssb-usb2.patch | 4 ++-- .../patches-2.6.30/260-ohci-set-dma-mask.patch | 4 ++-- .../brcm47xx/patches-2.6.30/270-ehci-ssb.patch | 16 ++++++++-------- .../patches-2.6.30/275-usb2-bcm5354-init.patch | 4 ++-- .../280-activate_ssb_support_in_usb.patch | 4 ++-- 12 files changed, 33 insertions(+), 33 deletions(-) diff --git a/target/linux/brcm47xx/patches-2.6.28/130-remove_scache.patch b/target/linux/brcm47xx/patches-2.6.28/130-remove_scache.patch index 167f67d19e..e4ea20d6bf 100644 --- a/target/linux/brcm47xx/patches-2.6.28/130-remove_scache.patch +++ b/target/linux/brcm47xx/patches-2.6.28/130-remove_scache.patch @@ -8,7 +8,7 @@ select PCI_GT64XXX_PCI0 select MIPS_MSC select SWAP_IO_SPACE -@@ -1383,13 +1382,6 @@ config IP22_CPU_SCACHE +@@ -1395,13 +1394,6 @@ config IP22_CPU_SCACHE bool select BOARD_SCACHE diff --git a/target/linux/brcm47xx/patches-2.6.28/250-ohci-ssb-usb2.patch b/target/linux/brcm47xx/patches-2.6.28/250-ohci-ssb-usb2.patch index 065a16b386..25b27e47e8 100644 --- a/target/linux/brcm47xx/patches-2.6.28/250-ohci-ssb-usb2.patch +++ b/target/linux/brcm47xx/patches-2.6.28/250-ohci-ssb-usb2.patch @@ -2,8 +2,8 @@ drivers/usb/host/ohci-ssb.c | 39 ++++++++++++++++++++++++++++++++++++--- 1 file changed, 36 insertions(+), 3 deletions(-) ---- linux-2.6.28.10.orig/drivers/usb/host/ohci-ssb.c -+++ linux-2.6.28.10/drivers/usb/host/ohci-ssb.c +--- a/drivers/usb/host/ohci-ssb.c ++++ b/drivers/usb/host/ohci-ssb.c @@ -106,10 +106,42 @@ static int ssb_ohci_attach(struct ssb_de int err = -ENOMEM; u32 tmp, flags = 0; diff --git a/target/linux/brcm47xx/patches-2.6.28/260-ohci-set-dma-mask.patch b/target/linux/brcm47xx/patches-2.6.28/260-ohci-set-dma-mask.patch index 6da3f10bf2..50dcd5718e 100644 --- a/target/linux/brcm47xx/patches-2.6.28/260-ohci-set-dma-mask.patch +++ b/target/linux/brcm47xx/patches-2.6.28/260-ohci-set-dma-mask.patch @@ -2,8 +2,8 @@ drivers/usb/host/ohci-ssb.c | 3 +++ 1 file changed, 3 insertions(+) ---- linux-2.6.28.10.orig/drivers/usb/host/ohci-ssb.c -+++ linux-2.6.28.10/drivers/usb/host/ohci-ssb.c +--- a/drivers/usb/host/ohci-ssb.c ++++ b/drivers/usb/host/ohci-ssb.c @@ -106,6 +106,9 @@ static int ssb_ohci_attach(struct ssb_de int err = -ENOMEM; u32 tmp, flags = 0; diff --git a/target/linux/brcm47xx/patches-2.6.28/270-ehci-ssb.patch b/target/linux/brcm47xx/patches-2.6.28/270-ehci-ssb.patch index 3b5cfd5e61..2af7b4945b 100644 --- a/target/linux/brcm47xx/patches-2.6.28/270-ehci-ssb.patch +++ b/target/linux/brcm47xx/patches-2.6.28/270-ehci-ssb.patch @@ -5,8 +5,8 @@ drivers/usb/host/ohci-ssb.c | 23 +++++ 4 files changed, 247 insertions(+), 2 deletions(-) ---- linux-2.6.28.10.orig/drivers/usb/host/Kconfig -+++ linux-2.6.28.10/drivers/usb/host/Kconfig +--- a/drivers/usb/host/Kconfig ++++ b/drivers/usb/host/Kconfig @@ -96,6 +96,19 @@ config USB_EHCI_HCD_PPC_OF Enables support for the USB controller present on the PowerPC OpenFirmware platform bus. @@ -27,8 +27,8 @@ config USB_ISP116X_HCD tristate "ISP116X HCD support" depends on USB ---- linux-2.6.28.10.orig/drivers/usb/host/ehci-hcd.c -+++ linux-2.6.28.10/drivers/usb/host/ehci-hcd.c +--- a/drivers/usb/host/ehci-hcd.c ++++ b/drivers/usb/host/ehci-hcd.c @@ -1036,8 +1036,16 @@ MODULE_LICENSE ("GPL"); #define PLATFORM_DRIVER ixp4xx_ehci_driver #endif @@ -49,7 +49,7 @@ #endif --- /dev/null -+++ linux-2.6.28.10/drivers/usb/host/ehci-ssb.c ++++ b/drivers/usb/host/ehci-ssb.c @@ -0,0 +1,201 @@ +/* + * Sonics Silicon Backplane @@ -252,8 +252,8 @@ + SSB_DEVTABLE_END +}; +MODULE_DEVICE_TABLE(ssb, ssb_ehci_table); ---- linux-2.6.28.10.orig/drivers/usb/host/ohci-ssb.c -+++ linux-2.6.28.10/drivers/usb/host/ohci-ssb.c +--- a/drivers/usb/host/ohci-ssb.c ++++ b/drivers/usb/host/ohci-ssb.c @@ -17,6 +17,8 @@ */ #include diff --git a/target/linux/brcm47xx/patches-2.6.28/275-usb2-bcm5354-init.patch b/target/linux/brcm47xx/patches-2.6.28/275-usb2-bcm5354-init.patch index a166329150..3d8327ebfd 100644 --- a/target/linux/brcm47xx/patches-2.6.28/275-usb2-bcm5354-init.patch +++ b/target/linux/brcm47xx/patches-2.6.28/275-usb2-bcm5354-init.patch @@ -13,8 +13,8 @@ Signed-off-by: Steve Brown drivers/usb/host/ohci-ssb.c | 37 +++++++++++++++++++++++-------------- 1 file changed, 23 insertions(+), 14 deletions(-) ---- linux-2.6.28.10.orig/drivers/usb/host/ohci-ssb.c -+++ linux-2.6.28.10/drivers/usb/host/ohci-ssb.c +--- a/drivers/usb/host/ohci-ssb.c ++++ b/drivers/usb/host/ohci-ssb.c @@ -141,22 +141,31 @@ static int ssb_ohci_attach(struct ssb_de */ ssb_device_enable(dev, 0); diff --git a/target/linux/brcm47xx/patches-2.6.28/280-activate_ssb_support_in_usb.patch b/target/linux/brcm47xx/patches-2.6.28/280-activate_ssb_support_in_usb.patch index 6a4dbd5f29..aeb9d334c3 100644 --- a/target/linux/brcm47xx/patches-2.6.28/280-activate_ssb_support_in_usb.patch +++ b/target/linux/brcm47xx/patches-2.6.28/280-activate_ssb_support_in_usb.patch @@ -3,8 +3,8 @@ This prevents the options from being delete with make kernel_oldconfig. drivers/ssb/Kconfig | 2 ++ 1 file changed, 2 insertions(+) ---- linux-2.6.28.10.orig/drivers/ssb/Kconfig -+++ linux-2.6.28.10/drivers/ssb/Kconfig +--- a/drivers/ssb/Kconfig ++++ b/drivers/ssb/Kconfig @@ -126,6 +126,8 @@ config SSB_DRIVER_MIPS config SSB_EMBEDDED bool diff --git a/target/linux/brcm47xx/patches-2.6.30/130-remove_scache.patch b/target/linux/brcm47xx/patches-2.6.30/130-remove_scache.patch index b7db322fed..4ed30486d2 100644 --- a/target/linux/brcm47xx/patches-2.6.30/130-remove_scache.patch +++ b/target/linux/brcm47xx/patches-2.6.30/130-remove_scache.patch @@ -8,7 +8,7 @@ select PCI_GT64XXX_PCI0 select MIPS_MSC select SWAP_IO_SPACE -@@ -1472,13 +1471,6 @@ config IP22_CPU_SCACHE +@@ -1473,13 +1472,6 @@ config IP22_CPU_SCACHE bool select BOARD_SCACHE diff --git a/target/linux/brcm47xx/patches-2.6.30/250-ohci-ssb-usb2.patch b/target/linux/brcm47xx/patches-2.6.30/250-ohci-ssb-usb2.patch index 065a16b386..25b27e47e8 100644 --- a/target/linux/brcm47xx/patches-2.6.30/250-ohci-ssb-usb2.patch +++ b/target/linux/brcm47xx/patches-2.6.30/250-ohci-ssb-usb2.patch @@ -2,8 +2,8 @@ drivers/usb/host/ohci-ssb.c | 39 ++++++++++++++++++++++++++++++++++++--- 1 file changed, 36 insertions(+), 3 deletions(-) ---- linux-2.6.28.10.orig/drivers/usb/host/ohci-ssb.c -+++ linux-2.6.28.10/drivers/usb/host/ohci-ssb.c +--- a/drivers/usb/host/ohci-ssb.c ++++ b/drivers/usb/host/ohci-ssb.c @@ -106,10 +106,42 @@ static int ssb_ohci_attach(struct ssb_de int err = -ENOMEM; u32 tmp, flags = 0; diff --git a/target/linux/brcm47xx/patches-2.6.30/260-ohci-set-dma-mask.patch b/target/linux/brcm47xx/patches-2.6.30/260-ohci-set-dma-mask.patch index 6da3f10bf2..50dcd5718e 100644 --- a/target/linux/brcm47xx/patches-2.6.30/260-ohci-set-dma-mask.patch +++ b/target/linux/brcm47xx/patches-2.6.30/260-ohci-set-dma-mask.patch @@ -2,8 +2,8 @@ drivers/usb/host/ohci-ssb.c | 3 +++ 1 file changed, 3 insertions(+) ---- linux-2.6.28.10.orig/drivers/usb/host/ohci-ssb.c -+++ linux-2.6.28.10/drivers/usb/host/ohci-ssb.c +--- a/drivers/usb/host/ohci-ssb.c ++++ b/drivers/usb/host/ohci-ssb.c @@ -106,6 +106,9 @@ static int ssb_ohci_attach(struct ssb_de int err = -ENOMEM; u32 tmp, flags = 0; diff --git a/target/linux/brcm47xx/patches-2.6.30/270-ehci-ssb.patch b/target/linux/brcm47xx/patches-2.6.30/270-ehci-ssb.patch index 4077ebe1f9..d1421332bf 100644 --- a/target/linux/brcm47xx/patches-2.6.30/270-ehci-ssb.patch +++ b/target/linux/brcm47xx/patches-2.6.30/270-ehci-ssb.patch @@ -5,8 +5,8 @@ drivers/usb/host/ohci-ssb.c | 23 +++++ 4 files changed, 247 insertions(+), 2 deletions(-) ---- linux-2.6.30.5.orig/drivers/usb/host/Kconfig -+++ linux-2.6.30.5/drivers/usb/host/Kconfig +--- a/drivers/usb/host/Kconfig ++++ b/drivers/usb/host/Kconfig @@ -106,6 +106,19 @@ config USB_OXU210HP_HCD To compile this driver as a module, choose M here: the module will be called oxu210hp-hcd. @@ -27,9 +27,9 @@ config USB_ISP116X_HCD tristate "ISP116X HCD support" depends on USB ---- linux-2.6.30.5.orig/drivers/usb/host/ehci-hcd.c -+++ linux-2.6.30.5/drivers/usb/host/ehci-hcd.c -@@ -1072,8 +1072,16 @@ MODULE_LICENSE ("GPL"); +--- a/drivers/usb/host/ehci-hcd.c ++++ b/drivers/usb/host/ehci-hcd.c +@@ -1075,8 +1075,16 @@ MODULE_LICENSE ("GPL"); #define PLATFORM_DRIVER ixp4xx_ehci_driver #endif @@ -49,7 +49,7 @@ #endif --- /dev/null -+++ linux-2.6.30.5/drivers/usb/host/ehci-ssb.c ++++ b/drivers/usb/host/ehci-ssb.c @@ -0,0 +1,201 @@ +/* + * Sonics Silicon Backplane @@ -252,8 +252,8 @@ + SSB_DEVTABLE_END +}; +MODULE_DEVICE_TABLE(ssb, ssb_ehci_table); ---- linux-2.6.30.5.orig/drivers/usb/host/ohci-ssb.c -+++ linux-2.6.30.5/drivers/usb/host/ohci-ssb.c +--- a/drivers/usb/host/ohci-ssb.c ++++ b/drivers/usb/host/ohci-ssb.c @@ -17,6 +17,8 @@ */ #include diff --git a/target/linux/brcm47xx/patches-2.6.30/275-usb2-bcm5354-init.patch b/target/linux/brcm47xx/patches-2.6.30/275-usb2-bcm5354-init.patch index a166329150..3d8327ebfd 100644 --- a/target/linux/brcm47xx/patches-2.6.30/275-usb2-bcm5354-init.patch +++ b/target/linux/brcm47xx/patches-2.6.30/275-usb2-bcm5354-init.patch @@ -13,8 +13,8 @@ Signed-off-by: Steve Brown drivers/usb/host/ohci-ssb.c | 37 +++++++++++++++++++++++-------------- 1 file changed, 23 insertions(+), 14 deletions(-) ---- linux-2.6.28.10.orig/drivers/usb/host/ohci-ssb.c -+++ linux-2.6.28.10/drivers/usb/host/ohci-ssb.c +--- a/drivers/usb/host/ohci-ssb.c ++++ b/drivers/usb/host/ohci-ssb.c @@ -141,22 +141,31 @@ static int ssb_ohci_attach(struct ssb_de */ ssb_device_enable(dev, 0); diff --git a/target/linux/brcm47xx/patches-2.6.30/280-activate_ssb_support_in_usb.patch b/target/linux/brcm47xx/patches-2.6.30/280-activate_ssb_support_in_usb.patch index c8a481610b..aeb9d334c3 100644 --- a/target/linux/brcm47xx/patches-2.6.30/280-activate_ssb_support_in_usb.patch +++ b/target/linux/brcm47xx/patches-2.6.30/280-activate_ssb_support_in_usb.patch @@ -3,8 +3,8 @@ This prevents the options from being delete with make kernel_oldconfig. drivers/ssb/Kconfig | 2 ++ 1 file changed, 2 insertions(+) ---- linux-2.6.30.5.orig/drivers/ssb/Kconfig -+++ linux-2.6.30.5/drivers/ssb/Kconfig +--- a/drivers/ssb/Kconfig ++++ b/drivers/ssb/Kconfig @@ -126,6 +126,8 @@ config SSB_DRIVER_MIPS config SSB_EMBEDDED bool -- 2.30.2