refresh patches

SVN-Revision: 17733
This commit is contained in:
Hauke Mehrtens 2009-09-26 11:42:43 +00:00
parent 7a74903bba
commit 6247141e78
12 changed files with 33 additions and 33 deletions

View file

@ -8,7 +8,7 @@
select PCI_GT64XXX_PCI0 select PCI_GT64XXX_PCI0
select MIPS_MSC select MIPS_MSC
select SWAP_IO_SPACE select SWAP_IO_SPACE
@@ -1383,13 +1382,6 @@ config IP22_CPU_SCACHE @@ -1395,13 +1394,6 @@ config IP22_CPU_SCACHE
bool bool
select BOARD_SCACHE select BOARD_SCACHE

View file

@ -2,8 +2,8 @@
drivers/usb/host/ohci-ssb.c | 39 ++++++++++++++++++++++++++++++++++++--- drivers/usb/host/ohci-ssb.c | 39 ++++++++++++++++++++++++++++++++++++---
1 file changed, 36 insertions(+), 3 deletions(-) 1 file changed, 36 insertions(+), 3 deletions(-)
--- linux-2.6.28.10.orig/drivers/usb/host/ohci-ssb.c --- a/drivers/usb/host/ohci-ssb.c
+++ linux-2.6.28.10/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 @@ -106,10 +106,42 @@ static int ssb_ohci_attach(struct ssb_de
int err = -ENOMEM; int err = -ENOMEM;
u32 tmp, flags = 0; u32 tmp, flags = 0;

View file

@ -2,8 +2,8 @@
drivers/usb/host/ohci-ssb.c | 3 +++ drivers/usb/host/ohci-ssb.c | 3 +++
1 file changed, 3 insertions(+) 1 file changed, 3 insertions(+)
--- linux-2.6.28.10.orig/drivers/usb/host/ohci-ssb.c --- a/drivers/usb/host/ohci-ssb.c
+++ linux-2.6.28.10/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 @@ -106,6 +106,9 @@ static int ssb_ohci_attach(struct ssb_de
int err = -ENOMEM; int err = -ENOMEM;
u32 tmp, flags = 0; u32 tmp, flags = 0;

View file

@ -5,8 +5,8 @@
drivers/usb/host/ohci-ssb.c | 23 +++++ drivers/usb/host/ohci-ssb.c | 23 +++++
4 files changed, 247 insertions(+), 2 deletions(-) 4 files changed, 247 insertions(+), 2 deletions(-)
--- linux-2.6.28.10.orig/drivers/usb/host/Kconfig --- a/drivers/usb/host/Kconfig
+++ linux-2.6.28.10/drivers/usb/host/Kconfig +++ b/drivers/usb/host/Kconfig
@@ -96,6 +96,19 @@ config USB_EHCI_HCD_PPC_OF @@ -96,6 +96,19 @@ config USB_EHCI_HCD_PPC_OF
Enables support for the USB controller present on the PowerPC Enables support for the USB controller present on the PowerPC
OpenFirmware platform bus. OpenFirmware platform bus.
@ -27,8 +27,8 @@
config USB_ISP116X_HCD config USB_ISP116X_HCD
tristate "ISP116X HCD support" tristate "ISP116X HCD support"
depends on USB depends on USB
--- linux-2.6.28.10.orig/drivers/usb/host/ehci-hcd.c --- a/drivers/usb/host/ehci-hcd.c
+++ linux-2.6.28.10/drivers/usb/host/ehci-hcd.c +++ b/drivers/usb/host/ehci-hcd.c
@@ -1036,8 +1036,16 @@ MODULE_LICENSE ("GPL"); @@ -1036,8 +1036,16 @@ MODULE_LICENSE ("GPL");
#define PLATFORM_DRIVER ixp4xx_ehci_driver #define PLATFORM_DRIVER ixp4xx_ehci_driver
#endif #endif
@ -49,7 +49,7 @@
#endif #endif
--- /dev/null --- /dev/null
+++ linux-2.6.28.10/drivers/usb/host/ehci-ssb.c +++ b/drivers/usb/host/ehci-ssb.c
@@ -0,0 +1,201 @@ @@ -0,0 +1,201 @@
+/* +/*
+ * Sonics Silicon Backplane + * Sonics Silicon Backplane
@ -252,8 +252,8 @@
+ SSB_DEVTABLE_END + SSB_DEVTABLE_END
+}; +};
+MODULE_DEVICE_TABLE(ssb, ssb_ehci_table); +MODULE_DEVICE_TABLE(ssb, ssb_ehci_table);
--- linux-2.6.28.10.orig/drivers/usb/host/ohci-ssb.c --- a/drivers/usb/host/ohci-ssb.c
+++ linux-2.6.28.10/drivers/usb/host/ohci-ssb.c +++ b/drivers/usb/host/ohci-ssb.c
@@ -17,6 +17,8 @@ @@ -17,6 +17,8 @@
*/ */
#include <linux/ssb/ssb.h> #include <linux/ssb/ssb.h>

View file

@ -13,8 +13,8 @@ Signed-off-by: Steve Brown <sbrown@cortland.com>
drivers/usb/host/ohci-ssb.c | 37 +++++++++++++++++++++++-------------- drivers/usb/host/ohci-ssb.c | 37 +++++++++++++++++++++++--------------
1 file changed, 23 insertions(+), 14 deletions(-) 1 file changed, 23 insertions(+), 14 deletions(-)
--- linux-2.6.28.10.orig/drivers/usb/host/ohci-ssb.c --- a/drivers/usb/host/ohci-ssb.c
+++ linux-2.6.28.10/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 @@ -141,22 +141,31 @@ static int ssb_ohci_attach(struct ssb_de
*/ */
ssb_device_enable(dev, 0); ssb_device_enable(dev, 0);

View file

@ -3,8 +3,8 @@ This prevents the options from being delete with make kernel_oldconfig.
drivers/ssb/Kconfig | 2 ++ drivers/ssb/Kconfig | 2 ++
1 file changed, 2 insertions(+) 1 file changed, 2 insertions(+)
--- linux-2.6.28.10.orig/drivers/ssb/Kconfig --- a/drivers/ssb/Kconfig
+++ linux-2.6.28.10/drivers/ssb/Kconfig +++ b/drivers/ssb/Kconfig
@@ -126,6 +126,8 @@ config SSB_DRIVER_MIPS @@ -126,6 +126,8 @@ config SSB_DRIVER_MIPS
config SSB_EMBEDDED config SSB_EMBEDDED
bool bool

View file

@ -8,7 +8,7 @@
select PCI_GT64XXX_PCI0 select PCI_GT64XXX_PCI0
select MIPS_MSC select MIPS_MSC
select SWAP_IO_SPACE select SWAP_IO_SPACE
@@ -1472,13 +1471,6 @@ config IP22_CPU_SCACHE @@ -1473,13 +1472,6 @@ config IP22_CPU_SCACHE
bool bool
select BOARD_SCACHE select BOARD_SCACHE

View file

@ -2,8 +2,8 @@
drivers/usb/host/ohci-ssb.c | 39 ++++++++++++++++++++++++++++++++++++--- drivers/usb/host/ohci-ssb.c | 39 ++++++++++++++++++++++++++++++++++++---
1 file changed, 36 insertions(+), 3 deletions(-) 1 file changed, 36 insertions(+), 3 deletions(-)
--- linux-2.6.28.10.orig/drivers/usb/host/ohci-ssb.c --- a/drivers/usb/host/ohci-ssb.c
+++ linux-2.6.28.10/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 @@ -106,10 +106,42 @@ static int ssb_ohci_attach(struct ssb_de
int err = -ENOMEM; int err = -ENOMEM;
u32 tmp, flags = 0; u32 tmp, flags = 0;

View file

@ -2,8 +2,8 @@
drivers/usb/host/ohci-ssb.c | 3 +++ drivers/usb/host/ohci-ssb.c | 3 +++
1 file changed, 3 insertions(+) 1 file changed, 3 insertions(+)
--- linux-2.6.28.10.orig/drivers/usb/host/ohci-ssb.c --- a/drivers/usb/host/ohci-ssb.c
+++ linux-2.6.28.10/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 @@ -106,6 +106,9 @@ static int ssb_ohci_attach(struct ssb_de
int err = -ENOMEM; int err = -ENOMEM;
u32 tmp, flags = 0; u32 tmp, flags = 0;

View file

@ -5,8 +5,8 @@
drivers/usb/host/ohci-ssb.c | 23 +++++ drivers/usb/host/ohci-ssb.c | 23 +++++
4 files changed, 247 insertions(+), 2 deletions(-) 4 files changed, 247 insertions(+), 2 deletions(-)
--- linux-2.6.30.5.orig/drivers/usb/host/Kconfig --- a/drivers/usb/host/Kconfig
+++ linux-2.6.30.5/drivers/usb/host/Kconfig +++ b/drivers/usb/host/Kconfig
@@ -106,6 +106,19 @@ config USB_OXU210HP_HCD @@ -106,6 +106,19 @@ config USB_OXU210HP_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 oxu210hp-hcd. module will be called oxu210hp-hcd.
@ -27,9 +27,9 @@
config USB_ISP116X_HCD config USB_ISP116X_HCD
tristate "ISP116X HCD support" tristate "ISP116X HCD support"
depends on USB depends on USB
--- linux-2.6.30.5.orig/drivers/usb/host/ehci-hcd.c --- a/drivers/usb/host/ehci-hcd.c
+++ linux-2.6.30.5/drivers/usb/host/ehci-hcd.c +++ b/drivers/usb/host/ehci-hcd.c
@@ -1072,8 +1072,16 @@ MODULE_LICENSE ("GPL"); @@ -1075,8 +1075,16 @@ MODULE_LICENSE ("GPL");
#define PLATFORM_DRIVER ixp4xx_ehci_driver #define PLATFORM_DRIVER ixp4xx_ehci_driver
#endif #endif
@ -49,7 +49,7 @@
#endif #endif
--- /dev/null --- /dev/null
+++ linux-2.6.30.5/drivers/usb/host/ehci-ssb.c +++ b/drivers/usb/host/ehci-ssb.c
@@ -0,0 +1,201 @@ @@ -0,0 +1,201 @@
+/* +/*
+ * Sonics Silicon Backplane + * Sonics Silicon Backplane
@ -252,8 +252,8 @@
+ SSB_DEVTABLE_END + SSB_DEVTABLE_END
+}; +};
+MODULE_DEVICE_TABLE(ssb, ssb_ehci_table); +MODULE_DEVICE_TABLE(ssb, ssb_ehci_table);
--- linux-2.6.30.5.orig/drivers/usb/host/ohci-ssb.c --- a/drivers/usb/host/ohci-ssb.c
+++ linux-2.6.30.5/drivers/usb/host/ohci-ssb.c +++ b/drivers/usb/host/ohci-ssb.c
@@ -17,6 +17,8 @@ @@ -17,6 +17,8 @@
*/ */
#include <linux/ssb/ssb.h> #include <linux/ssb/ssb.h>

View file

@ -13,8 +13,8 @@ Signed-off-by: Steve Brown <sbrown@cortland.com>
drivers/usb/host/ohci-ssb.c | 37 +++++++++++++++++++++++-------------- drivers/usb/host/ohci-ssb.c | 37 +++++++++++++++++++++++--------------
1 file changed, 23 insertions(+), 14 deletions(-) 1 file changed, 23 insertions(+), 14 deletions(-)
--- linux-2.6.28.10.orig/drivers/usb/host/ohci-ssb.c --- a/drivers/usb/host/ohci-ssb.c
+++ linux-2.6.28.10/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 @@ -141,22 +141,31 @@ static int ssb_ohci_attach(struct ssb_de
*/ */
ssb_device_enable(dev, 0); ssb_device_enable(dev, 0);

View file

@ -3,8 +3,8 @@ This prevents the options from being delete with make kernel_oldconfig.
drivers/ssb/Kconfig | 2 ++ drivers/ssb/Kconfig | 2 ++
1 file changed, 2 insertions(+) 1 file changed, 2 insertions(+)
--- linux-2.6.30.5.orig/drivers/ssb/Kconfig --- a/drivers/ssb/Kconfig
+++ linux-2.6.30.5/drivers/ssb/Kconfig +++ b/drivers/ssb/Kconfig
@@ -126,6 +126,8 @@ config SSB_DRIVER_MIPS @@ -126,6 +126,8 @@ config SSB_DRIVER_MIPS
config SSB_EMBEDDED config SSB_EMBEDDED
bool bool