usb and pci patches added

3 files changed, 197 insertions, 30 deletions

diff --git a/pci/pci-drivers-pci-some-cleanups.patch b/pci/pci-drivers-pci-some-cleanups.patch
new file mode 100644
index 0000000000000..ba35070101a8d
--- /dev/null
+++ b/pci/pci-drivers-pci-some-cleanups.patch
@@ -0,0 +1,144 @@
+From bunk@stusta.de Fri Dec 16 15:50:06 2005
+Date: Sat, 17 Dec 2005 00:44:52 +0100
+From: Adrian Bunk <bunk@stusta.de>
+To: gregkh@suse.de
+Subject: PCI: drivers/pci/: some cleanups
+Message-ID: <20051216234452.GM23349@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_max_busnr()
+  - proc.c: pci_proc_attach_bus()
+  - remove.c: pci_remove_device_safe
+
+
+Signed-off-by: Adrian Bunk <bunk@stusta.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ drivers/pci/hotplug/pciehp_core.c |    2 +-
+ drivers/pci/pci.c                 |    6 +++---
+ drivers/pci/pci.h                 |    5 -----
+ drivers/pci/proc.c                |    3 ++-
+ drivers/pci/remove.c              |    3 ++-
+ 5 files changed, 8 insertions(+), 11 deletions(-)
+
+--- gregkh-2.6.orig/drivers/pci/hotplug/pciehp_core.c
++++ gregkh-2.6/drivers/pci/hotplug/pciehp_core.c
+@@ -512,7 +512,7 @@ static void __exit unload_pciehpd(void)
+ 
+ }
+ 
+-int hpdriver_context = 0;
++static int hpdriver_context = 0;
+ 
+ static void pciehp_remove (struct pcie_device *device)
+ {
+--- gregkh-2.6.orig/drivers/pci/pci.h
++++ gregkh-2.6/drivers/pci/pci.h
+@@ -26,20 +26,15 @@ extern int pci_user_write_config_dword(s
+ #ifdef CONFIG_PROC_FS
+ extern int pci_proc_attach_device(struct pci_dev *dev);
+ extern int pci_proc_detach_device(struct pci_dev *dev);
+-extern int pci_proc_attach_bus(struct pci_bus *bus);
+ extern int pci_proc_detach_bus(struct pci_bus *bus);
+ #else
+ static inline int pci_proc_attach_device(struct pci_dev *dev) { return 0; }
+ static inline int pci_proc_detach_device(struct pci_dev *dev) { return 0; }
+-static inline int pci_proc_attach_bus(struct pci_bus *bus) { return 0; }
+ static inline int pci_proc_detach_bus(struct pci_bus *bus) { return 0; }
+ #endif
+ 
+ /* Functions for PCI Hotplug drivers to use */
+ extern unsigned int pci_do_scan_bus(struct pci_bus *bus);
+-extern int pci_remove_device_safe(struct pci_dev *dev);
+-extern unsigned char pci_max_busnr(void);
+-extern unsigned char pci_bus_max_busnr(struct pci_bus *bus);
+ 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
+ 	return 0;
+ }
+ 
++#if 0
+ int pci_proc_attach_bus(struct pci_bus* bus)
+ {
+ 	struct proc_dir_entry *de = bus->procdir;
+@@ -447,6 +448,7 @@ int pci_proc_attach_bus(struct pci_bus* 
+ 	}
+ 	return 0;
+ }
++#endif  /*  0  */
+ 
+ int pci_proc_detach_bus(struct pci_bus* bus)
+ {
+@@ -612,7 +614,6 @@ __initcall(pci_proc_init);
+ 
+ #ifdef CONFIG_HOTPLUG
+ EXPORT_SYMBOL(pci_proc_attach_device);
+-EXPORT_SYMBOL(pci_proc_attach_bus);
+ EXPORT_SYMBOL(pci_proc_detach_bus);
+ #endif
+ 
+--- gregkh-2.6.orig/drivers/pci/remove.c
++++ gregkh-2.6/drivers/pci/remove.c
+@@ -48,6 +48,7 @@ static void pci_destroy_dev(struct pci_d
+  * in question is not being used by a driver.
+  * Returns 0 on success.
+  */
++#if 0
+ int pci_remove_device_safe(struct pci_dev *dev)
+ {
+ 	if (pci_dev_driver(dev))
+@@ -55,7 +56,7 @@ int pci_remove_device_safe(struct pci_de
+ 	pci_destroy_dev(dev);
+ 	return 0;
+ }
+-EXPORT_SYMBOL(pci_remove_device_safe);
++#endif  /*  0  */
+ 
+ void pci_remove_bus(struct pci_bus *pci_bus)
+ {
diff --git a/pci/pci-update-toshiba-ohci-quirk-dmi-table.patch b/pci/pci-update-toshiba-ohci-quirk-dmi-table.patch
new file mode 100644
index 0000000000000..de79a5f0ee3b6
--- /dev/null
+++ b/pci/pci-update-toshiba-ohci-quirk-dmi-table.patch
@@ -0,0 +1,38 @@
+From jbarnes@virtuousgeek.org Sat Dec 17 14:41:57 2005
+From: Jesse Barnes <jbarnes@virtuousgeek.org>
+To: gregkh@suse.de
+Subject: PCI: update Toshiba ohci quirk DMI table
+Date: Sat, 17 Dec 2005 09:27:50 -0800
+Message-Id: <200512170927.50760.jbarnes@virtuousgeek.org>
+
+I upgraded my Toshiba Satellite BIOS recently to see if it would fix an
+ACPI related problem I have
+(http://bugzilla.kernel.org/show_bug.cgi?id=5727).  Unfortunately, it
+didn't, and moreover, Toshiba chose to change the system version in the
+DMI table with the update, causing the OHCI1394 related quirk to break.
+This patch updates the DMI table for the quirk to include Toshiba's new
+version name for this machine; I've tested it and it seems to work fine.
+
+Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ arch/i386/pci/fixup.c |    7 +++++++
+ 1 file changed, 7 insertions(+)
+
+--- gregkh-2.6.orig/arch/i386/pci/fixup.c
++++ gregkh-2.6/arch/i386/pci/fixup.c
+@@ -413,6 +413,13 @@ static struct dmi_system_id __devinitdat
+ 			DMI_MATCH(DMI_PRODUCT_VERSION, "PSM4"),
+ 		},
+ 	},
++	{
++		.ident = "Toshiba A40 based laptop",
++		.matches = {
++			DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"),
++			DMI_MATCH(DMI_PRODUCT_VERSION, "PSA40U"),
++		},
++	},
+ 	{ }
+ };
+ 
diff --git a/pci/shot-accross-the-bow.patch b/pci/shot-accross-the-bow.patch
index a9943e5bb0885..a3b4ddb0e8468 100644
--- a/pci/shot-accross-the-bow.patch
+++ b/pci/shot-accross-the-bow.patch
@@ -35,20 +35,20 @@ Something to think about...
 Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
 
 ---
- drivers/pci/access.c     |   12 +++++-----
+ drivers/pci/access.c     |   12 +++++------
  drivers/pci/bus.c        |    6 ++---
- drivers/pci/msi.c        |    8 +++---
+ drivers/pci/msi.c        |    8 +++----
  drivers/pci/pci-acpi.c   |    4 +--
- drivers/pci/pci-driver.c |   16 ++++++-------
- drivers/pci/pci.c        |   54 +++++++++++++++++++++++------------------------
- drivers/pci/probe.c      |   14 ++++++------
- drivers/pci/proc.c       |    6 ++---
+ drivers/pci/pci-driver.c |   16 +++++++--------
+ drivers/pci/pci.c        |   50 +++++++++++++++++++++++------------------------
+ drivers/pci/probe.c      |   14 ++++++-------
+ drivers/pci/proc.c       |    4 +--
  drivers/pci/quirks.c     |    4 +--
- drivers/pci/remove.c     |    8 +++---
- drivers/pci/rom.c        |    8 +++---
- drivers/pci/search.c     |   20 ++++++++---------
+ drivers/pci/remove.c     |    6 ++---
+ drivers/pci/rom.c        |    8 +++----
+ drivers/pci/search.c     |   20 +++++++++---------
  drivers/pci/setup-bus.c  |    6 ++---
- 13 files changed, 83 insertions(+), 83 deletions(-)
+ 13 files changed, 79 insertions(+), 79 deletions(-)
 
 --- gregkh-2.6.orig/drivers/pci/access.c
 +++ gregkh-2.6/drivers/pci/access.c
@@ -142,7 +142,7 @@ Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
 +EXPORT_SYMBOL_GPL(pci_dev_put);
 --- gregkh-2.6.orig/drivers/pci/pci.c
 +++ gregkh-2.6/drivers/pci/pci.c
-@@ -425,7 +425,7 @@ pci_power_t pci_choose_state(struct pci_
+@@ -427,7 +427,7 @@ pci_power_t pci_choose_state(struct pci_
  	return PCI_D0;
  }
  
@@ -151,7 +151,7 @@ Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
  
  /**
   * pci_save_state - save the PCI configuration space of a device before suspending
-@@ -910,36 +910,36 @@ __setup("pci=", pci_setup);
+@@ -912,34 +912,34 @@ __setup("pci=", pci_setup);
  #if defined(CONFIG_ISA) || defined(CONFIG_EISA)
  /* FIXME: Some boxes have multiple ISA bridges! */
  struct pci_dev *isa_bridge;
@@ -163,8 +163,6 @@ Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
 -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);
@@ -177,8 +175,6 @@ Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
 +EXPORT_SYMBOL_GPL(pci_enable_device_bars);
 +EXPORT_SYMBOL_GPL(pci_enable_device);
 +EXPORT_SYMBOL_GPL(pci_disable_device);
-+EXPORT_SYMBOL_GPL(pci_max_busnr);
-+EXPORT_SYMBOL_GPL(pci_bus_max_busnr);
 +EXPORT_SYMBOL_GPL(pci_find_capability);
 +EXPORT_SYMBOL_GPL(pci_bus_find_capability);
 +EXPORT_SYMBOL_GPL(pci_release_regions);
@@ -247,15 +243,13 @@ Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
  #endif
 --- gregkh-2.6.orig/drivers/pci/proc.c
 +++ gregkh-2.6/drivers/pci/proc.c
-@@ -611,8 +611,8 @@ static int __init pci_proc_init(void)
+@@ -613,7 +613,7 @@ static int __init pci_proc_init(void)
  __initcall(pci_proc_init);
  
  #ifdef CONFIG_HOTPLUG
 -EXPORT_SYMBOL(pci_proc_attach_device);
--EXPORT_SYMBOL(pci_proc_attach_bus);
 -EXPORT_SYMBOL(pci_proc_detach_bus);
 +EXPORT_SYMBOL_GPL(pci_proc_attach_device);
-+EXPORT_SYMBOL_GPL(pci_proc_attach_bus);
 +EXPORT_SYMBOL_GPL(pci_proc_detach_bus);
  #endif
  
@@ -273,16 +267,7 @@ Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
  #endif
 --- gregkh-2.6.orig/drivers/pci/remove.c
 +++ gregkh-2.6/drivers/pci/remove.c
-@@ -55,7 +55,7 @@ int pci_remove_device_safe(struct pci_de
- 	pci_destroy_dev(dev);
- 	return 0;
- }
--EXPORT_SYMBOL(pci_remove_device_safe);
-+EXPORT_SYMBOL_GPL(pci_remove_device_safe);
- 
- void pci_remove_bus(struct pci_bus *pci_bus)
- {
-@@ -70,7 +70,7 @@ void pci_remove_bus(struct pci_bus *pci_
+@@ -71,7 +71,7 @@ void pci_remove_bus(struct pci_bus *pci_
  	sysfs_remove_link(&pci_bus->class_dev.kobj, "bridge");
  	class_device_unregister(&pci_bus->class_dev);
  }
@@ -291,7 +276,7 @@ Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
  
  /**
   * pci_remove_bus_device - remove a PCI device and any children
-@@ -118,5 +118,5 @@ void pci_remove_behind_bridge(struct pci
+@@ -119,5 +119,5 @@ void pci_remove_behind_bridge(struct pci
  	}
  }