usb and other stuff

1 files changed, 35 insertions, 43 deletions

diff --git a/pci/pci-drivers-pci-some-cleanups.patch b/pci/pci-drivers-pci-some-cleanups.patch
index ba35070101a8d..eeda3351a4787 100644
--- a/pci/pci-drivers-pci-some-cleanups.patch
+++ b/pci/pci-drivers-pci-some-cleanups.patch
@@ -1,16 +1,16 @@
-From bunk@stusta.de Fri Dec 16 15:50:06 2005
-Date: Sat, 17 Dec 2005 00:44:52 +0100
+From bunk@stusta.de Wed Dec 21 16:08:53 2005
+Date: Thu, 22 Dec 2005 01:08:52 +0100
 From: Adrian Bunk <bunk@stusta.de>
 To: gregkh@suse.de
-Subject: PCI: drivers/pci/: some cleanups
-Message-ID: <20051216234452.GM23349@stusta.de>
+Subject: PCI: drivers/pci: some cleanups
+Message-ID: <20051222000851.GH3917@stusta.de>
 Content-Disposition: inline
 
 This patch contains the following cleanups:
 - hotplug/pciehp_core.c: make the needlessly global hpdriver_context 
                          static
-- pci.c: make the needlessly global pci_bus_max_busnr() static
 - #if 0 the following unused functions:
+  - pci.c: pci_bus_max_busnr()
   - pci.c: pci_max_busnr()
   - proc.c: pci_proc_attach_bus()
   - remove.c: pci_remove_device_safe
@@ -21,11 +21,11 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 
 ---
  drivers/pci/hotplug/pciehp_core.c |    2 +-
- drivers/pci/pci.c                 |    6 +++---
+ drivers/pci/pci.c                 |    5 +++--
  drivers/pci/pci.h                 |    5 -----
  drivers/pci/proc.c                |    3 ++-
  drivers/pci/remove.c              |    3 ++-
- 5 files changed, 8 insertions(+), 11 deletions(-)
+ 5 files changed, 8 insertions(+), 10 deletions(-)
 
 --- gregkh-2.6.orig/drivers/pci/hotplug/pciehp_core.c
 +++ gregkh-2.6/drivers/pci/hotplug/pciehp_core.c
@@ -61,42 +61,6 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  extern int pci_bus_find_capability (struct pci_bus *bus, unsigned int devfn, int cap);
  
  extern void pci_remove_legacy_files(struct pci_bus *bus);
---- gregkh-2.6.orig/drivers/pci/pci.c
-+++ gregkh-2.6/drivers/pci/pci.c
-@@ -27,7 +27,7 @@
-  * Given a PCI bus, returns the highest PCI bus number present in the set
-  * including the given PCI bus and its list of child PCI buses.
-  */
--unsigned char __devinit
-+static unsigned char __devinit
- pci_bus_max_busnr(struct pci_bus* bus)
- {
- 	struct list_head *tmp;
-@@ -48,6 +48,7 @@ pci_bus_max_busnr(struct pci_bus* bus)
-  * Returns the highest PCI bus number present in the system global list of
-  * PCI buses.
-  */
-+#if 0
- unsigned char __devinit
- pci_max_busnr(void)
- {
-@@ -62,6 +63,7 @@ pci_max_busnr(void)
- 	}
- 	return max;
- }
-+#endif  /*  0  */
- 
- static int __pci_find_next_cap(struct pci_bus *bus, unsigned int devfn, u8 pos, int cap)
- {
-@@ -917,8 +919,6 @@ EXPORT_SYMBOL_GPL(pci_restore_bars);
- EXPORT_SYMBOL(pci_enable_device_bars);
- EXPORT_SYMBOL(pci_enable_device);
- EXPORT_SYMBOL(pci_disable_device);
--EXPORT_SYMBOL(pci_max_busnr);
--EXPORT_SYMBOL(pci_bus_max_busnr);
- EXPORT_SYMBOL(pci_find_capability);
- EXPORT_SYMBOL(pci_bus_find_capability);
- EXPORT_SYMBOL(pci_release_regions);
 --- gregkh-2.6.orig/drivers/pci/proc.c
 +++ gregkh-2.6/drivers/pci/proc.c
 @@ -431,6 +431,7 @@ int pci_proc_detach_device(struct pci_de
@@ -142,3 +106,31 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  
  void pci_remove_bus(struct pci_bus *pci_bus)
  {
+--- gregkh-2.6.orig/drivers/pci/pci.c
++++ gregkh-2.6/drivers/pci/pci.c
+@@ -19,6 +19,7 @@
+ #include <asm/dma.h>	/* isa_dma_bridge_buggy */
+ #include "pci.h"
+ 
++#if 0
+ 
+ /**
+  * pci_bus_max_busnr - returns maximum PCI bus number of given bus' children
+@@ -63,6 +64,8 @@ pci_max_busnr(void)
+ 	return max;
+ }
+ 
++#endif  /*  0  */
++
+ static int __pci_find_next_cap(struct pci_bus *bus, unsigned int devfn, u8 pos, int cap)
+ {
+ 	u8 id;
+@@ -917,8 +920,6 @@ EXPORT_SYMBOL_GPL(pci_restore_bars);
+ EXPORT_SYMBOL(pci_enable_device_bars);
+ EXPORT_SYMBOL(pci_enable_device);
+ EXPORT_SYMBOL(pci_disable_device);
+-EXPORT_SYMBOL(pci_max_busnr);
+-EXPORT_SYMBOL(pci_bus_max_busnr);
+ EXPORT_SYMBOL(pci_find_capability);
+ EXPORT_SYMBOL(pci_bus_find_capability);
+ EXPORT_SYMBOL(pci_release_regions);