2.6.14-git11 refresh

6 files changed, 283 insertions, 146 deletions

diff --git a/pci/pci-driver-owner-removal.patch b/pci/pci-driver-owner-removal.patch
index 4a5ed5b7afa30..20c1faa0d6818 100644
--- a/pci/pci-driver-owner-removal.patch
+++ b/pci/pci-driver-owner-removal.patch
@@ -6,6 +6,18 @@ Subject: PCI: removed unneeded .owner field from struct pci_driver
 Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 
 ---
+ drivers/char/agp/ali-agp.c               |    1 -
+ drivers/char/agp/amd-k7-agp.c            |    1 -
+ drivers/char/agp/amd64-agp.c             |    1 -
+ drivers/char/agp/ati-agp.c               |    1 -
+ drivers/char/agp/efficeon-agp.c          |    1 -
+ drivers/char/agp/i460-agp.c              |    1 -
+ drivers/char/agp/intel-agp.c             |    1 -
+ drivers/char/agp/nvidia-agp.c            |    1 -
+ drivers/char/agp/sis-agp.c               |    1 -
+ drivers/char/agp/sworks-agp.c            |    1 -
+ drivers/char/agp/uninorth-agp.c          |    1 -
+ drivers/char/agp/via-agp.c               |    1 -
  drivers/char/epca.c                      |    1 -
  drivers/char/synclink.c                  |    1 -
  drivers/char/synclinkmp.c                |    1 -
@@ -74,7 +86,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  sound/pci/via82xx_modem.c                |    1 -
  sound/pci/vx222/vx222.c                  |    1 -
  sound/pci/ymfpci/ymfpci.c                |    1 -
- 68 files changed, 68 deletions(-)
+ 80 files changed, 80 deletions(-)
 
 --- gregkh-2.6.orig/drivers/usb/host/ehci-pci.c
 +++ gregkh-2.6/drivers/usb/host/ehci-pci.c
@@ -178,7 +190,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  	.probe		= hydra_probe,
 --- gregkh-2.6.orig/drivers/i2c/busses/i2c-i801.c
 +++ gregkh-2.6/drivers/i2c/busses/i2c-i801.c
-@@ -560,7 +560,6 @@ static void __devexit i801_remove(struct
+@@ -556,7 +556,6 @@ static void __devexit i801_remove(struct
  }
  
  static struct pci_driver i801_driver = {
@@ -308,7 +320,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  	.remove		= __devexit_p(mthca_remove_one)
 --- gregkh-2.6.orig/sound/pci/ali5451/ali5451.c
 +++ gregkh-2.6/sound/pci/ali5451/ali5451.c
-@@ -2413,7 +2413,6 @@ static void __devexit snd_ali_remove(str
+@@ -2403,7 +2403,6 @@ static void __devexit snd_ali_remove(str
  
  static struct pci_driver driver = {
  	.name = "ALI 5451",
@@ -318,7 +330,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  	.remove = __devexit_p(snd_ali_remove),
 --- gregkh-2.6.orig/sound/pci/hda/hda_intel.c
 +++ gregkh-2.6/sound/pci/hda/hda_intel.c
-@@ -1608,7 +1608,6 @@ MODULE_DEVICE_TABLE(pci, azx_ids);
+@@ -1616,7 +1616,6 @@ MODULE_DEVICE_TABLE(pci, azx_ids);
  /* pci_driver definition */
  static struct pci_driver driver = {
  	.name = "HDA Intel",
@@ -328,7 +340,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  	.remove = __devexit_p(azx_remove),
 --- gregkh-2.6.orig/sound/pci/ad1889.c
 +++ gregkh-2.6/sound/pci/ad1889.c
-@@ -1068,7 +1068,6 @@ MODULE_DEVICE_TABLE(pci, snd_ad1889_ids)
+@@ -1067,7 +1067,6 @@ MODULE_DEVICE_TABLE(pci, snd_ad1889_ids)
  
  static struct pci_driver ad1889_pci = {
  	.name = "AD1889 Audio",
@@ -338,7 +350,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  	.remove = __devexit_p(snd_ad1889_remove),
 --- gregkh-2.6.orig/sound/pci/als4000.c
 +++ gregkh-2.6/sound/pci/als4000.c
-@@ -770,7 +770,6 @@ static void __devexit snd_card_als4000_r
+@@ -768,7 +768,6 @@ static void __devexit snd_card_als4000_r
  
  static struct pci_driver driver = {
  	.name = "ALS4000",
@@ -348,7 +360,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  	.remove = __devexit_p(snd_card_als4000_remove),
 --- gregkh-2.6.orig/sound/pci/atiixp.c
 +++ gregkh-2.6/sound/pci/atiixp.c
-@@ -1645,7 +1645,6 @@ static void __devexit snd_atiixp_remove(
+@@ -1635,7 +1635,6 @@ static void __devexit snd_atiixp_remove(
  
  static struct pci_driver driver = {
  	.name = "ATI IXP AC97 controller",
@@ -358,7 +370,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  	.remove = __devexit_p(snd_atiixp_remove),
 --- gregkh-2.6.orig/sound/pci/atiixp_modem.c
 +++ gregkh-2.6/sound/pci/atiixp_modem.c
-@@ -1318,7 +1318,6 @@ static void __devexit snd_atiixp_remove(
+@@ -1309,7 +1309,6 @@ static void __devexit snd_atiixp_remove(
  
  static struct pci_driver driver = {
  	.name = "ATI IXP MC97 controller",
@@ -368,7 +380,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  	.remove = __devexit_p(snd_atiixp_remove),
 --- gregkh-2.6.orig/sound/pci/azt3328.c
 +++ gregkh-2.6/sound/pci/azt3328.c
-@@ -1511,7 +1511,6 @@ static void __devexit snd_azf3328_remove
+@@ -1838,7 +1838,6 @@ snd_azf3328_remove(struct pci_dev *pci)
  
  static struct pci_driver driver = {
  	.name = "AZF3328",
@@ -388,7 +400,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  	.remove = __devexit_p(snd_bt87x_remove),
 --- gregkh-2.6.orig/sound/pci/cmipci.c
 +++ gregkh-2.6/sound/pci/cmipci.c
-@@ -3037,7 +3037,6 @@ static void __devexit snd_cmipci_remove(
+@@ -3053,7 +3053,6 @@ static void __devexit snd_cmipci_remove(
  
  static struct pci_driver driver = {
  	.name = "C-Media PCI",
@@ -398,7 +410,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  	.remove = __devexit_p(snd_cmipci_remove),
 --- gregkh-2.6.orig/sound/pci/cs4281.c
 +++ gregkh-2.6/sound/pci/cs4281.c
-@@ -2108,7 +2108,6 @@ static int cs4281_resume(snd_card_t *car
+@@ -2106,7 +2106,6 @@ static int cs4281_resume(snd_card_t *car
  
  static struct pci_driver driver = {
  	.name = "CS4281",
@@ -408,7 +420,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  	.remove = __devexit_p(snd_cs4281_remove),
 --- gregkh-2.6.orig/sound/pci/ens1370.c
 +++ gregkh-2.6/sound/pci/ens1370.c
-@@ -2387,7 +2387,6 @@ static void __devexit snd_audiopci_remov
+@@ -2386,7 +2386,6 @@ static void __devexit snd_audiopci_remov
  
  static struct pci_driver driver = {
  	.name = DRIVER_NAME,
@@ -418,7 +430,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  	.remove = __devexit_p(snd_audiopci_remove),
 --- gregkh-2.6.orig/sound/pci/es1938.c
 +++ gregkh-2.6/sound/pci/es1938.c
-@@ -1746,7 +1746,6 @@ static void __devexit snd_es1938_remove(
+@@ -1758,7 +1758,6 @@ static void __devexit snd_es1938_remove(
  
  static struct pci_driver driver = {
  	.name = "ESS ES1938 (Solo-1)",
@@ -428,7 +440,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  	.remove = __devexit_p(snd_es1938_remove),
 --- gregkh-2.6.orig/sound/pci/es1968.c
 +++ gregkh-2.6/sound/pci/es1968.c
-@@ -2763,7 +2763,6 @@ static void __devexit snd_es1968_remove(
+@@ -2761,7 +2761,6 @@ static void __devexit snd_es1968_remove(
  
  static struct pci_driver driver = {
  	.name = "ES1968 (ESS Maestro)",
@@ -438,7 +450,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  	.remove = __devexit_p(snd_es1968_remove),
 --- gregkh-2.6.orig/sound/pci/fm801.c
 +++ gregkh-2.6/sound/pci/fm801.c
-@@ -1462,7 +1462,6 @@ static void __devexit snd_card_fm801_rem
+@@ -1459,7 +1459,6 @@ static void __devexit snd_card_fm801_rem
  
  static struct pci_driver driver = {
  	.name = "FM801",
@@ -448,7 +460,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  	.remove = __devexit_p(snd_card_fm801_remove),
 --- gregkh-2.6.orig/sound/pci/intel8x0.c
 +++ gregkh-2.6/sound/pci/intel8x0.c
-@@ -2864,7 +2864,6 @@ static void __devexit snd_intel8x0_remov
+@@ -2876,7 +2876,6 @@ static void __devexit snd_intel8x0_remov
  
  static struct pci_driver driver = {
  	.name = "Intel ICH",
@@ -458,7 +470,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  	.remove = __devexit_p(snd_intel8x0_remove),
 --- gregkh-2.6.orig/sound/pci/intel8x0m.c
 +++ gregkh-2.6/sound/pci/intel8x0m.c
-@@ -1326,7 +1326,6 @@ static void __devexit snd_intel8x0m_remo
+@@ -1317,7 +1317,6 @@ static void __devexit snd_intel8x0m_remo
  
  static struct pci_driver driver = {
  	.name = "Intel ICH Modem",
@@ -468,7 +480,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  	.remove = __devexit_p(snd_intel8x0m_remove),
 --- gregkh-2.6.orig/sound/pci/maestro3.c
 +++ gregkh-2.6/sound/pci/maestro3.c
-@@ -2861,7 +2861,6 @@ static void __devexit snd_m3_remove(stru
+@@ -2858,7 +2858,6 @@ static void __devexit snd_m3_remove(stru
  
  static struct pci_driver driver = {
  	.name = "Maestro3",
@@ -498,7 +510,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  	.remove = __devexit_p(snd_rme96_remove),
 --- gregkh-2.6.orig/sound/pci/sonicvibes.c
 +++ gregkh-2.6/sound/pci/sonicvibes.c
-@@ -1508,7 +1508,6 @@ static void __devexit snd_sonic_remove(s
+@@ -1502,7 +1502,6 @@ static void __devexit snd_sonic_remove(s
  
  static struct pci_driver driver = {
  	.name = "S3 SonicVibes",
@@ -508,7 +520,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  	.remove = __devexit_p(snd_sonic_remove),
 --- gregkh-2.6.orig/sound/pci/via82xx.c
 +++ gregkh-2.6/sound/pci/via82xx.c
-@@ -2345,7 +2345,6 @@ static void __devexit snd_via82xx_remove
+@@ -2478,7 +2478,6 @@ static void __devexit snd_via82xx_remove
  
  static struct pci_driver driver = {
  	.name = "VIA 82xx Audio",
@@ -518,7 +530,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  	.remove = __devexit_p(snd_via82xx_remove),
 --- gregkh-2.6.orig/sound/pci/via82xx_modem.c
 +++ gregkh-2.6/sound/pci/via82xx_modem.c
-@@ -1207,7 +1207,6 @@ static void __devexit snd_via82xx_remove
+@@ -1198,7 +1198,6 @@ static void __devexit snd_via82xx_remove
  
  static struct pci_driver driver = {
  	.name = "VIA 82xx Modem",
@@ -538,7 +550,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  	.remove = __devexit_p(snd_vortex_remove),
 --- gregkh-2.6.orig/sound/pci/ca0106/ca0106_main.c
 +++ gregkh-2.6/sound/pci/ca0106/ca0106_main.c
-@@ -1390,7 +1390,6 @@ MODULE_DEVICE_TABLE(pci, snd_ca0106_ids)
+@@ -1499,7 +1499,6 @@ MODULE_DEVICE_TABLE(pci, snd_ca0106_ids)
  // pci_driver definition
  static struct pci_driver driver = {
  	.name = "CA0106",
@@ -568,7 +580,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  	.remove = __devexit_p(snd_card_emu10k1_remove),
 --- gregkh-2.6.orig/sound/pci/emu10k1/emu10k1x.c
 +++ gregkh-2.6/sound/pci/emu10k1/emu10k1x.c
-@@ -1615,7 +1615,6 @@ MODULE_DEVICE_TABLE(pci, snd_emu10k1x_id
+@@ -1613,7 +1613,6 @@ MODULE_DEVICE_TABLE(pci, snd_emu10k1x_id
  // pci_driver definition
  static struct pci_driver driver = {
  	.name = "EMU10K1X",
@@ -588,7 +600,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  	.remove = __devexit_p(snd_ice1712_remove),
 --- gregkh-2.6.orig/sound/pci/ice1712/ice1724.c
 +++ gregkh-2.6/sound/pci/ice1712/ice1724.c
-@@ -2315,7 +2315,6 @@ static void __devexit snd_vt1724_remove(
+@@ -2332,7 +2332,6 @@ static void __devexit snd_vt1724_remove(
  
  static struct pci_driver driver = {
  	.name = "ICE1724",
@@ -608,7 +620,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  	.remove = __devexit_p(snd_korg1212_remove),
 --- gregkh-2.6.orig/sound/pci/mixart/mixart.c
 +++ gregkh-2.6/sound/pci/mixart/mixart.c
-@@ -1424,7 +1424,6 @@ static void __devexit snd_mixart_remove(
+@@ -1423,7 +1423,6 @@ static void __devexit snd_mixart_remove(
  
  static struct pci_driver driver = {
  	.name = "Digigram miXart",
@@ -628,7 +640,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  	.remove = __devexit_p(snd_vx222_remove),
 --- gregkh-2.6.orig/sound/pci/nm256/nm256.c
 +++ gregkh-2.6/sound/pci/nm256/nm256.c
-@@ -1668,7 +1668,6 @@ static void __devexit snd_nm256_remove(s
+@@ -1673,7 +1673,6 @@ static void __devexit snd_nm256_remove(s
  
  static struct pci_driver driver = {
  	.name = "NeoMagic 256",
@@ -638,7 +650,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  	.remove = __devexit_p(snd_nm256_remove),
 --- gregkh-2.6.orig/sound/pci/rme9652/hdsp.c
 +++ gregkh-2.6/sound/pci/rme9652/hdsp.c
-@@ -5216,7 +5216,6 @@ static void __devexit snd_hdsp_remove(st
+@@ -5062,7 +5062,6 @@ static void __devexit snd_hdsp_remove(st
  
  static struct pci_driver driver = {
  	.name =     "RME Hammerfall DSP",
@@ -648,7 +660,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  	.remove = __devexit_p(snd_hdsp_remove),
 --- gregkh-2.6.orig/sound/pci/rme9652/hdspm.c
 +++ gregkh-2.6/sound/pci/rme9652/hdspm.c
-@@ -3640,7 +3640,6 @@ static void __devexit snd_hdspm_remove(s
+@@ -3639,7 +3639,6 @@ static void __devexit snd_hdspm_remove(s
  
  static struct pci_driver driver = {
  	.name = "RME Hammerfall DSP MADI",
@@ -678,7 +690,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  	.remove = __devexit_p(snd_trident_remove),
 --- gregkh-2.6.orig/sound/pci/ymfpci/ymfpci.c
 +++ gregkh-2.6/sound/pci/ymfpci/ymfpci.c
-@@ -352,7 +352,6 @@ static void __devexit snd_card_ymfpci_re
+@@ -344,7 +344,6 @@ static void __devexit snd_card_ymfpci_re
  
  static struct pci_driver driver = {
  	.name = "Yamaha DS-XG PCI",
@@ -756,3 +768,123 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  
  	.probe =	net2280_probe,
  	.remove =	net2280_remove,
+--- gregkh-2.6.orig/drivers/char/agp/ali-agp.c
++++ gregkh-2.6/drivers/char/agp/ali-agp.c
+@@ -389,7 +389,6 @@ static struct pci_device_id agp_ali_pci_
+ MODULE_DEVICE_TABLE(pci, agp_ali_pci_table);
+ 
+ static struct pci_driver agp_ali_pci_driver = {
+-	.owner		= THIS_MODULE,
+ 	.name		= "agpgart-ali",
+ 	.id_table	= agp_ali_pci_table,
+ 	.probe		= agp_ali_probe,
+--- gregkh-2.6.orig/drivers/char/agp/amd-k7-agp.c
++++ gregkh-2.6/drivers/char/agp/amd-k7-agp.c
+@@ -515,7 +515,6 @@ static struct pci_device_id agp_amdk7_pc
+ MODULE_DEVICE_TABLE(pci, agp_amdk7_pci_table);
+ 
+ static struct pci_driver agp_amdk7_pci_driver = {
+-	.owner		= THIS_MODULE,
+ 	.name		= "agpgart-amdk7",
+ 	.id_table	= agp_amdk7_pci_table,
+ 	.probe		= agp_amdk7_probe,
+--- gregkh-2.6.orig/drivers/char/agp/amd64-agp.c
++++ gregkh-2.6/drivers/char/agp/amd64-agp.c
+@@ -703,7 +703,6 @@ static struct pci_device_id agp_amd64_pc
+ MODULE_DEVICE_TABLE(pci, agp_amd64_pci_table);
+ 
+ static struct pci_driver agp_amd64_pci_driver = {
+-	.owner		= THIS_MODULE,
+ 	.name		= "agpgart-amd64",
+ 	.id_table	= agp_amd64_pci_table,
+ 	.probe		= agp_amd64_probe,
+--- gregkh-2.6.orig/drivers/char/agp/ati-agp.c
++++ gregkh-2.6/drivers/char/agp/ati-agp.c
+@@ -521,7 +521,6 @@ static struct pci_device_id agp_ati_pci_
+ MODULE_DEVICE_TABLE(pci, agp_ati_pci_table);
+ 
+ static struct pci_driver agp_ati_pci_driver = {
+-	.owner		= THIS_MODULE,
+ 	.name		= "agpgart-ati",
+ 	.id_table	= agp_ati_pci_table,
+ 	.probe		= agp_ati_probe,
+--- gregkh-2.6.orig/drivers/char/agp/efficeon-agp.c
++++ gregkh-2.6/drivers/char/agp/efficeon-agp.c
+@@ -429,7 +429,6 @@ static struct pci_device_id agp_efficeon
+ MODULE_DEVICE_TABLE(pci, agp_efficeon_pci_table);
+ 
+ static struct pci_driver agp_efficeon_pci_driver = {
+-	.owner		= THIS_MODULE,
+ 	.name		= "agpgart-efficeon",
+ 	.id_table	= agp_efficeon_pci_table,
+ 	.probe		= agp_efficeon_probe,
+--- gregkh-2.6.orig/drivers/char/agp/i460-agp.c
++++ gregkh-2.6/drivers/char/agp/i460-agp.c
+@@ -617,7 +617,6 @@ static struct pci_device_id agp_intel_i4
+ MODULE_DEVICE_TABLE(pci, agp_intel_i460_pci_table);
+ 
+ static struct pci_driver agp_intel_i460_pci_driver = {
+-	.owner		= THIS_MODULE,
+ 	.name		= "agpgart-intel-i460",
+ 	.id_table	= agp_intel_i460_pci_table,
+ 	.probe		= agp_intel_i460_probe,
+--- gregkh-2.6.orig/drivers/char/agp/intel-agp.c
++++ gregkh-2.6/drivers/char/agp/intel-agp.c
+@@ -1824,7 +1824,6 @@ static struct pci_device_id agp_intel_pc
+ MODULE_DEVICE_TABLE(pci, agp_intel_pci_table);
+ 
+ static struct pci_driver agp_intel_pci_driver = {
+-	.owner		= THIS_MODULE,
+ 	.name		= "agpgart-intel",
+ 	.id_table	= agp_intel_pci_table,
+ 	.probe		= agp_intel_probe,
+--- gregkh-2.6.orig/drivers/char/agp/nvidia-agp.c
++++ gregkh-2.6/drivers/char/agp/nvidia-agp.c
+@@ -398,7 +398,6 @@ static struct pci_device_id agp_nvidia_p
+ MODULE_DEVICE_TABLE(pci, agp_nvidia_pci_table);
+ 
+ static struct pci_driver agp_nvidia_pci_driver = {
+-	.owner		= THIS_MODULE,
+ 	.name		= "agpgart-nvidia",
+ 	.id_table	= agp_nvidia_pci_table,
+ 	.probe		= agp_nvidia_probe,
+--- gregkh-2.6.orig/drivers/char/agp/sis-agp.c
++++ gregkh-2.6/drivers/char/agp/sis-agp.c
+@@ -332,7 +332,6 @@ static struct pci_device_id agp_sis_pci_
+ MODULE_DEVICE_TABLE(pci, agp_sis_pci_table);
+ 
+ static struct pci_driver agp_sis_pci_driver = {
+-	.owner		= THIS_MODULE,
+ 	.name		= "agpgart-sis",
+ 	.id_table	= agp_sis_pci_table,
+ 	.probe		= agp_sis_probe,
+--- gregkh-2.6.orig/drivers/char/agp/sworks-agp.c
++++ gregkh-2.6/drivers/char/agp/sworks-agp.c
+@@ -545,7 +545,6 @@ static struct pci_device_id agp_serverwo
+ MODULE_DEVICE_TABLE(pci, agp_serverworks_pci_table);
+ 
+ static struct pci_driver agp_serverworks_pci_driver = {
+-	.owner		= THIS_MODULE,
+ 	.name		= "agpgart-serverworks",
+ 	.id_table	= agp_serverworks_pci_table,
+ 	.probe		= agp_serverworks_probe,
+--- gregkh-2.6.orig/drivers/char/agp/uninorth-agp.c
++++ gregkh-2.6/drivers/char/agp/uninorth-agp.c
+@@ -658,7 +658,6 @@ static struct pci_device_id agp_uninorth
+ MODULE_DEVICE_TABLE(pci, agp_uninorth_pci_table);
+ 
+ static struct pci_driver agp_uninorth_pci_driver = {
+-	.owner		= THIS_MODULE,
+ 	.name		= "agpgart-uninorth",
+ 	.id_table	= agp_uninorth_pci_table,
+ 	.probe		= agp_uninorth_probe,
+--- gregkh-2.6.orig/drivers/char/agp/via-agp.c
++++ gregkh-2.6/drivers/char/agp/via-agp.c
+@@ -518,7 +518,6 @@ MODULE_DEVICE_TABLE(pci, agp_via_pci_tab
+ 
+ 
+ static struct pci_driver agp_via_pci_driver = {
+-	.owner		= THIS_MODULE,
+ 	.name		= "agpgart-via",
+ 	.id_table	= agp_via_pci_table,
+ 	.probe		= agp_via_probe,
diff --git a/pci/pci-driver-store_new_id-not-inline.patch b/pci/pci-driver-store_new_id-not-inline.patch
index 218af03a9349e..b8fdc7046225d 100644
--- a/pci/pci-driver-store_new_id-not-inline.patch
+++ b/pci/pci-driver-store_new_id-not-inline.patch
@@ -15,9 +15,10 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  drivers/pci/pci-driver.c |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
---- gregkh-2.6.orig/drivers/pci/pci-driver.c	2005-11-02 09:25:02.000000000 -0800
-+++ gregkh-2.6/drivers/pci/pci-driver.c	2005-11-02 11:54:14.000000000 -0800
-@@ -36,7 +36,7 @@
+---
+--- gregkh-2.6.orig/drivers/pci/pci-driver.c
++++ gregkh-2.6/drivers/pci/pci-driver.c
+@@ -37,7 +37,7 @@ struct pci_dynid {
   * Adds a new dynamic pci device ID to this driver,
   * and causes the driver to probe for all devices again.
   */
diff --git a/pci/pci-pciehp-01.patch b/pci/pci-pciehp-01.patch
index cf339f7ff97b4..5a1abf82e6120 100644
--- a/pci/pci-pciehp-01.patch
+++ b/pci/pci-pciehp-01.patch
@@ -23,9 +23,10 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  drivers/pci/hotplug/pciehprm_nonacpi.c |  347 -------
  6 files changed, 85 insertions(+), 3237 deletions(-)
 
---- gregkh-2.6.orig/drivers/pci/hotplug/pciehp.h	2005-10-27 22:11:49.000000000 -0700
-+++ gregkh-2.6/drivers/pci/hotplug/pciehp.h	2005-11-02 10:54:23.000000000 -0800
-@@ -59,14 +59,8 @@
+---
+--- gregkh-2.6.orig/drivers/pci/hotplug/pciehp.h
++++ gregkh-2.6/drivers/pci/hotplug/pciehp.h
+@@ -59,14 +59,8 @@ struct pci_func {
  	u8 configured;
  	u8 switch_save;
  	u8 presence_save;
@@ -40,7 +41,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  	struct pci_dev* pci_dev;
  };
  
-@@ -90,12 +84,6 @@
+@@ -90,12 +84,6 @@ struct slot {
  	struct list_head	slot_list;
  };
  
@@ -53,7 +54,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  struct event_info {
  	u32 event_type;
  	u8 hp_slot;
-@@ -107,10 +95,6 @@
+@@ -107,10 +95,6 @@ struct controller {
  	void *hpc_ctlr_handle;		/* HPC controller handle */
  	int num_slots;			/* Number of slots on ctlr */
  	int slot_num_inc;		/* 1 or -1 */
@@ -64,7 +65,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  	struct pci_dev *pci_dev;
  	struct pci_bus *pci_bus;
  	struct event_info event_queue[10];
-@@ -133,20 +117,6 @@
+@@ -133,20 +117,6 @@ struct controller {
  	u8 cap_base;
  };
  
@@ -85,7 +86,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  #define INT_BUTTON_IGNORE		0
  #define INT_PRESENCE_ON			1
  #define INT_PRESENCE_OFF		2
-@@ -203,14 +173,12 @@
+@@ -203,14 +173,12 @@ struct resource_lists {
  #define msg_HPC_rev_error	"Unsupported revision of the PCI hot plug controller found.\n"
  #define msg_HPC_non_pcie	"The PCI hot plug controller is not supported by this driver.\n"
  #define msg_HPC_not_supported	"This system is not supported by this version of pciephd module. Upgrade to a newer version of pciehpd\n"
@@ -100,7 +101,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  extern int	pciehp_event_start_thread	(void);
  extern void	pciehp_event_stop_thread	(void);
  extern struct 	pci_func *pciehp_slot_create	(unsigned char busnumber);
-@@ -224,19 +192,12 @@
+@@ -224,19 +192,12 @@ extern u8	pciehp_handle_presence_change	
  extern u8	pciehp_handle_power_fault	(u8 hp_slot, void *inst_id);
  /* extern void	long_delay (int delay); */
  
@@ -121,7 +122,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  extern int	pciehp_unconfigure_device	(struct pci_func* func);
  
  
-@@ -289,15 +250,6 @@
+@@ -289,15 +250,6 @@ static inline int wait_for_ctrl_irq(stru
  	return retval;
  }
  
@@ -137,9 +138,9 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  #define SLOT_NAME_SIZE 10
  
  static inline void make_slot_name(char *buffer, int buffer_size, struct slot *slot)
---- gregkh-2.6.orig/drivers/pci/hotplug/pciehp_core.c	2005-08-28 16:41:01.000000000 -0700
-+++ gregkh-2.6/drivers/pci/hotplug/pciehp_core.c	2005-11-02 10:54:23.000000000 -0800
-@@ -433,16 +433,8 @@
+--- gregkh-2.6.orig/drivers/pci/hotplug/pciehp_core.c
++++ gregkh-2.6/drivers/pci/hotplug/pciehp_core.c
+@@ -433,16 +433,8 @@ static int pciehp_probe(struct pcie_devi
  		goto err_out_free_ctrl_bus;
  	}
  
@@ -157,7 +158,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  	/* Setup the slot information structures */
  	rc = init_slots(ctrl);
  	if (rc) {
-@@ -521,18 +513,6 @@
+@@ -521,18 +513,6 @@ static int pcie_start_thread(void)
  	return retval;
  }
  
@@ -176,7 +177,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  static void __exit unload_pciehpd(void)
  {
  	struct pci_func *next;
-@@ -546,11 +526,6 @@
+@@ -546,11 +526,6 @@ static void __exit unload_pciehpd(void)
  	while (ctrl) {
  		cleanup_slots(ctrl);
  
@@ -188,7 +189,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  		kfree (ctrl->pci_bus);
  
  		ctrl->hpc_ops->release_ctlr(ctrl);
-@@ -564,11 +539,6 @@
+@@ -564,11 +539,6 @@ static void __exit unload_pciehpd(void)
  	for (loop = 0; loop < 256; loop++) {
  		next = pciehp_slot_list[loop];
  		while (next != NULL) {
@@ -200,7 +201,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  			TempSlot = next;
  			next = next->next;
  			kfree(TempSlot);
-@@ -652,8 +622,7 @@
+@@ -652,8 +622,7 @@ error_hpc_init:
  	if (retval) {
  		pciehprm_cleanup();
  		pciehp_event_stop_thread();
@@ -210,8 +211,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  
  	return retval;
  }
---- gregkh-2.6.orig/drivers/pci/hotplug/pciehp_ctrl.c	2005-10-27 22:11:49.000000000 -0700
-+++ gregkh-2.6/drivers/pci/hotplug/pciehp_ctrl.c	2005-11-02 10:54:23.000000000 -0800
+--- gregkh-2.6.orig/drivers/pci/hotplug/pciehp_ctrl.c
++++ gregkh-2.6/drivers/pci/hotplug/pciehp_ctrl.c
 @@ -42,10 +42,6 @@
  #include "pciehp.h"
  #include "pciehprm.h"
@@ -223,7 +224,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  static void interrupt_event_handler(struct controller *ctrl);
  
  static struct semaphore event_semaphore;	/* mutex for process loop (up if something to process) */
-@@ -252,627 +248,6 @@
+@@ -252,627 +248,6 @@ u8 pciehp_handle_power_fault(u8 hp_slot,
  	return rc;
  }
  
@@ -851,7 +852,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  /**
   * pciehp_slot_create - Creates a node and adds it to the proper bus.
   * @busnumber - bus where new node is to be located
-@@ -926,7 +301,6 @@
+@@ -926,7 +301,6 @@ static int slot_remove(struct pci_func *
  
  	if (next == old_slot) {
  		pciehp_slot_list[old_slot->bus] = old_slot->next;
@@ -859,7 +860,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  		kfree(old_slot);
  		return 0;
  	}
-@@ -937,7 +311,6 @@
+@@ -937,7 +311,6 @@ static int slot_remove(struct pci_func *
  
  	if (next->next == old_slot) {
  		next->next = old_slot->next;
@@ -867,7 +868,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  		kfree(old_slot);
  		return 0;
  	} else
-@@ -1103,12 +476,9 @@
+@@ -1103,12 +476,9 @@ static void set_slot_off(struct controll
  static u32 board_added(struct pci_func * func, struct controller * ctrl)
  {
  	u8 hp_slot;
@@ -880,7 +881,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  
  	p_slot = pciehp_find_slot(ctrl, func->device);
  	hp_slot = func->device - ctrl->slot_device_offset;
-@@ -1162,89 +532,43 @@
+@@ -1162,89 +532,43 @@ static u32 board_added(struct pci_func *
  		dbg("%s: temp register set to %x by power fault\n", __FUNCTION__, temp_register);
  		rc = POWER_FAILURE;
  		func->status = 0;
@@ -999,7 +1000,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  }
  
  
-@@ -1254,13 +578,9 @@
+@@ -1254,13 +578,9 @@ static u32 board_added(struct pci_func *
   */
  static u32 remove_board(struct pci_func *func, struct controller *ctrl)
  {
@@ -1013,7 +1014,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  	struct slot *p_slot;
  
  	if (func == NULL)
-@@ -1276,27 +596,6 @@
+@@ -1276,27 +596,6 @@ static u32 remove_board(struct pci_func 
  
  	dbg("In %s, hp_slot = %d\n", __FUNCTION__, hp_slot);
  
@@ -1041,7 +1042,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  	/* Change status to shutdown */
  	if (func->is_a_board)
  		func->status = 0x01;
-@@ -1330,26 +629,6 @@
+@@ -1330,26 +629,6 @@ static u32 remove_board(struct pci_func 
  
  	if (ctrl->add_support) {
  		while (func) {
@@ -1068,7 +1069,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  			if (is_bridge(func)) {
  				dbg("PCI Bridge Hot-Remove s:b:d:f(%02x:%02x:%02x:%02x)\n", 
  					ctrl->seg, func->bus, func->device, func->function);
-@@ -1918,787 +1197,3 @@
+@@ -1918,787 +1197,3 @@ int pciehp_disable_slot(struct slot *p_s
  	return rc;
  }
  
@@ -1856,8 +1857,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 -
 -	return 0;
 -}
---- gregkh-2.6.orig/drivers/pci/hotplug/pciehp_pci.c	2005-11-02 09:25:02.000000000 -0800
-+++ gregkh-2.6/drivers/pci/hotplug/pciehp_pci.c	2005-11-02 10:55:54.000000000 -0800
+--- gregkh-2.6.orig/drivers/pci/hotplug/pciehp_pci.c
++++ gregkh-2.6/drivers/pci/hotplug/pciehp_pci.c
 @@ -37,47 +37,70 @@
  #include <linux/pci.h>
  #include "../pci.h"
@@ -1959,7 +1960,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  int pciehp_unconfigure_device(struct pci_func* func) 
  {
  	int rc = 0;
-@@ -105,47 +128,6 @@
+@@ -105,47 +128,6 @@ int pciehp_unconfigure_device(struct pci
  }
  
  /*
@@ -2007,7 +2008,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
   * pciehp_save_config
   *
   * Reads configuration for all slots in a PCI bus and saves info.
-@@ -462,366 +444,3 @@
+@@ -462,366 +444,3 @@ int pciehp_save_slot_config(struct contr
  	return 0;
  }
  
@@ -2374,8 +2375,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 -	kfree_resource_list(&(func->p_mem_head));
 -	kfree_resource_list(&(func->bus_head));
 -}
---- gregkh-2.6.orig/drivers/pci/hotplug/pciehprm_acpi.c	2005-10-27 22:11:49.000000000 -0700
-+++ gregkh-2.6/drivers/pci/hotplug/pciehprm_acpi.c	2005-11-02 10:54:23.000000000 -0800
+--- gregkh-2.6.orig/drivers/pci/hotplug/pciehprm_acpi.c
++++ gregkh-2.6/drivers/pci/hotplug/pciehprm_acpi.c
 @@ -35,9 +35,6 @@
  #include <linux/pci-acpi.h>
  #include <asm/uaccess.h>
@@ -2386,7 +2387,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  #include <acpi/acpi.h>
  #include <acpi/acpi_bus.h>
  #include <acpi/actypes.h>
-@@ -84,10 +81,6 @@
+@@ -84,10 +81,6 @@ struct acpi_php_slot {
  	int	dev;
  	int	fun;
  	u32	sun;
@@ -2397,7 +2398,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  	void	*slot_ops;	/* _STA, _EJx, etc */
  	struct slot *slot;
  };		/* per func */
-@@ -104,14 +97,6 @@
+@@ -104,14 +97,6 @@ struct acpi_bridge {
  	int bus;			/* pdev->subordinate->number	*/
  	struct acpi__hpp		*_hpp;
  	struct acpi_php_slot	*slots;
@@ -2412,7 +2413,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  	int scanned;
  	int type;
  };
-@@ -268,485 +253,6 @@
+@@ -268,485 +253,6 @@ static int acpi_run_oshp ( struct acpi_b
  	return oshp_run_status;
  }
  
@@ -2898,7 +2899,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  /* find acpi_bridge downword from ab.  */
  static struct acpi_bridge *
  find_acpi_bridge_by_bus(
-@@ -1064,14 +570,6 @@
+@@ -1064,14 +570,6 @@ static struct acpi_bridge * add_host_bri
  	ab->scanned = 0;
  	ab->type = BRIDGE_TYPE_HOST;
  
@@ -2913,7 +2914,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  	status = pci_osc_control_set (OSC_PCI_EXPRESS_NATIVE_HP_CONTROL); 
  	if (ACPI_FAILURE(status)) {
  		err("%s: status %x\n", __FUNCTION__, status);
-@@ -1179,11 +677,6 @@
+@@ -1179,11 +677,6 @@ static void free_a_slot(struct acpi_php_
  {
  	dbg("        free a php func of slot(0x%02x) on PCI b:d:f=0x%02x:%02x:%02x\n", aps->sun, aps->bus, aps->dev, aps->fun);
  
@@ -2925,7 +2926,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  	kfree(aps);
  }
  
-@@ -1208,15 +701,6 @@
+@@ -1208,15 +701,6 @@ static void free_a_bridge( struct acpi_b
  		free_a_slot(aps);
  	}
  
@@ -2941,7 +2942,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  	kfree(ab);
  }
  
-@@ -1266,48 +750,6 @@
+@@ -1266,48 +750,6 @@ static int get_number_of_slots (
  	return slot_num;
  }
  
@@ -2990,7 +2991,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  static struct acpi_php_slot * get_acpi_slot (
  	struct acpi_bridge *ab,
  	u32 sun
-@@ -1349,288 +791,6 @@
+@@ -1349,288 +791,6 @@ void * pciehprm_get_slot(struct slot *sl
  }
  #endif
  
@@ -3279,9 +3280,9 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  int pciehprm_set_hpp(
  	struct controller *ctrl,
  	struct pci_func *func,
---- gregkh-2.6.orig/drivers/pci/hotplug/pciehprm_nonacpi.c	2005-11-02 09:25:02.000000000 -0800
-+++ gregkh-2.6/drivers/pci/hotplug/pciehprm_nonacpi.c	2005-11-02 10:56:32.000000000 -0800
-@@ -34,12 +34,7 @@
+--- gregkh-2.6.orig/drivers/pci/hotplug/pciehprm_nonacpi.c
++++ gregkh-2.6/drivers/pci/hotplug/pciehprm_nonacpi.c
+@@ -35,12 +35,7 @@
  #include <linux/pci.h>
  #include <linux/init.h>
  #include <linux/slab.h>
@@ -3294,7 +3295,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  #include "pciehp.h"
  #include "pciehprm.h"
  #include "pciehprm_nonacpi.h"
-@@ -50,11 +45,6 @@
+@@ -51,11 +46,6 @@ void pciehprm_cleanup(void)
  	return;
  }
  
@@ -3306,7 +3307,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  int pciehprm_get_physical_slot_number(struct controller *ctrl, u32 *sun, u8 busnum, u8 devnum)
  {
  
-@@ -62,343 +52,6 @@
+@@ -63,343 +53,6 @@ int pciehprm_get_physical_slot_number(st
  	return 0;
  }
  
diff --git a/pci/pci-pciehp-02.patch b/pci/pci-pciehp-02.patch
index b131d059fcb73..43afcddf5d0ce 100644
--- a/pci/pci-pciehp-02.patch
+++ b/pci/pci-pciehp-02.patch
@@ -34,9 +34,10 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  drivers/pci/hotplug/pciehprm_nonacpi.h |   56 --
  8 files changed, 96 insertions(+), 993 deletions(-)
 
---- gregkh-2.6.orig/drivers/pci/hotplug/pciehp.h	2005-11-02 10:57:01.000000000 -0800
-+++ gregkh-2.6/drivers/pci/hotplug/pciehp.h	2005-11-02 10:57:08.000000000 -0800
-@@ -49,6 +49,13 @@
+---
+--- gregkh-2.6.orig/drivers/pci/hotplug/pciehp.h
++++ gregkh-2.6/drivers/pci/hotplug/pciehp.h
+@@ -49,6 +49,13 @@ extern int pciehp_debug;
  #define info(format, arg...) printk(KERN_INFO "%s: " format, MY_NAME , ## arg)
  #define warn(format, arg...) printk(KERN_WARNING "%s: " format, MY_NAME , ## arg)
  
@@ -50,7 +51,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  struct pci_func {
  	struct pci_func *next;
  	u8 bus;
-@@ -199,6 +206,10 @@
+@@ -199,6 +206,10 @@ extern int	pciehp_save_config	 	(struct 
  extern int	pciehp_save_slot_config		(struct controller *ctrl, struct pci_func * new_slot);
  extern int	pciehp_configure_device		(struct slot *ctrl);
  extern int	pciehp_unconfigure_device	(struct pci_func* func);
@@ -61,8 +62,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  
  
  /* Global variables */
---- gregkh-2.6.orig/drivers/pci/hotplug/pciehp_core.c	2005-11-02 10:57:01.000000000 -0800
-+++ gregkh-2.6/drivers/pci/hotplug/pciehp_core.c	2005-11-02 10:57:08.000000000 -0800
+--- gregkh-2.6.orig/drivers/pci/hotplug/pciehp_core.c
++++ gregkh-2.6/drivers/pci/hotplug/pciehp_core.c
 @@ -39,7 +39,6 @@
  #include <linux/init.h>
  #include <asm/uaccess.h>
@@ -71,7 +72,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  #include <linux/interrupt.h>
  
  /* Global variables */
-@@ -381,6 +380,7 @@
+@@ -381,6 +380,7 @@ static int pciehp_probe(struct pcie_devi
  	dbg("%s: DRV_thread pid = %d\n", __FUNCTION__, current->pid);
  	
  	pdev = dev->port;
@@ -79,7 +80,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  
  	rc = pcie_init(ctrl, dev,
  		(php_intr_callback_t) pciehp_handle_attention_button,
-@@ -392,8 +392,6 @@
+@@ -392,8 +392,6 @@ static int pciehp_probe(struct pcie_devi
  		goto err_out_free_ctrl;
  	}
  
@@ -88,7 +89,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  	pci_set_drvdata(pdev, ctrl);
  
  	ctrl->pci_bus = kmalloc(sizeof(*ctrl->pci_bus), GFP_KERNEL);
-@@ -609,18 +607,14 @@
+@@ -609,18 +607,14 @@ static int __init pcied_init(void)
  	if (retval)
  		goto error_hpc_init;
  
@@ -112,7 +113,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  		pciehp_event_stop_thread();
  	};
  
-@@ -632,8 +626,6 @@
+@@ -632,8 +626,6 @@ static void __exit pcied_cleanup(void)
  	dbg("unload_pciehpd()\n");
  	unload_pciehpd();
  
@@ -121,8 +122,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  	dbg("pcie_port_service_unregister\n");
  	pcie_port_service_unregister(&hpdriver_portdrv);
  
---- gregkh-2.6.orig/drivers/pci/hotplug/pciehp_ctrl.c	2005-11-02 10:57:01.000000000 -0800
-+++ gregkh-2.6/drivers/pci/hotplug/pciehp_ctrl.c	2005-11-02 10:57:08.000000000 -0800
+--- gregkh-2.6.orig/drivers/pci/hotplug/pciehp_ctrl.c
++++ gregkh-2.6/drivers/pci/hotplug/pciehp_ctrl.c
 @@ -40,7 +40,6 @@
  #include <linux/pci.h>
  #include "../pci.h"
@@ -131,9 +132,9 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  
  static void interrupt_event_handler(struct controller *ctrl);
  
---- gregkh-2.6.orig/drivers/pci/hotplug/pciehp_hpc.c	2005-11-02 10:57:01.000000000 -0800
-+++ gregkh-2.6/drivers/pci/hotplug/pciehp_hpc.c	2005-11-02 10:57:08.000000000 -0800
-@@ -1470,6 +1470,10 @@
+--- gregkh-2.6.orig/drivers/pci/hotplug/pciehp_hpc.c
++++ gregkh-2.6/drivers/pci/hotplug/pciehp_hpc.c
+@@ -1470,6 +1470,10 @@ int pcie_init(struct controller * ctrl,
  	}
  	dbg("%s: SLOT_STATUS offset %x writes slot_status %x\n", __FUNCTION__, SLOT_STATUS(ctrl->cap_base), temp_word);
  	
@@ -144,8 +145,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  	/*  Add this HPC instance into the HPC list */
  	spin_lock(&list_lock);
  	if (php_ctlr_list_head == 0) {
---- gregkh-2.6.orig/drivers/pci/hotplug/pciehprm.h	2005-11-02 10:57:01.000000000 -0800
-+++ /dev/null	1970-01-01 00:00:00.000000000 +0000
+--- gregkh-2.6.orig/drivers/pci/hotplug/pciehprm.h
++++ /dev/null
 @@ -1,52 +0,0 @@
 -/*
 - * PCIEHPRM : PCIEHP Resource Manager for ACPI/non-ACPI platform
@@ -199,8 +200,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 -#endif
 -
 -#endif				/* _PCIEHPRM_H_ */
---- gregkh-2.6.orig/drivers/pci/hotplug/pciehprm_acpi.c	2005-11-02 10:57:01.000000000 -0800
-+++ gregkh-2.6/drivers/pci/hotplug/pciehprm_acpi.c	2005-11-02 10:57:08.000000000 -0800
+--- gregkh-2.6.orig/drivers/pci/hotplug/pciehprm_acpi.c
++++ gregkh-2.6/drivers/pci/hotplug/pciehprm_acpi.c
 @@ -39,70 +39,11 @@
  #include <acpi/acpi_bus.h>
  #include <acpi/actypes.h>
@@ -272,7 +273,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  static u8 * acpi_path_name( acpi_handle	handle)
  {
  	acpi_status		status;
-@@ -118,85 +59,43 @@
+@@ -118,85 +59,43 @@ static u8 * acpi_path_name( acpi_handle	
  		return path_name;	
  }
  
@@ -373,7 +374,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  		goto free_and_return;
  	}
  
-@@ -209,689 +108,94 @@
+@@ -209,689 +108,94 @@ static void acpi_get__hpp ( struct acpi_
  			nui[i] = (u8)ext_obj->integer.value;
  			break;
  		default:
@@ -1119,9 +1120,9 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 -		rc = pci_bus_write_config_word(pci_bus, devfn, PCI_BRIDGE_CONTROL, bcommand);
 -	}
 -}
---- gregkh-2.6.orig/drivers/pci/hotplug/pciehprm_nonacpi.c	2005-11-02 10:57:01.000000000 -0800
-+++ gregkh-2.6/drivers/pci/hotplug/pciehprm_nonacpi.c	2005-11-02 10:57:08.000000000 -0800
-@@ -36,15 +36,9 @@
+--- gregkh-2.6.orig/drivers/pci/hotplug/pciehprm_nonacpi.c
++++ gregkh-2.6/drivers/pci/hotplug/pciehprm_nonacpi.c
+@@ -37,15 +37,9 @@
  #include <linux/slab.h>
  #include <asm/uaccess.h>
  #include "pciehp.h"
@@ -1137,7 +1138,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  int pciehprm_get_physical_slot_number(struct controller *ctrl, u32 *sun, u8 busnum, u8 devnum)
  {
  
-@@ -52,106 +46,13 @@
+@@ -53,106 +47,13 @@ int pciehprm_get_physical_slot_number(st
  	return 0;
  }
  
@@ -1248,8 +1249,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 -
 -	return retval;
 -}
---- gregkh-2.6.orig/drivers/pci/hotplug/pciehprm_nonacpi.h	2005-11-02 10:57:01.000000000 -0800
-+++ /dev/null	1970-01-01 00:00:00.000000000 +0000
+--- gregkh-2.6.orig/drivers/pci/hotplug/pciehprm_nonacpi.h
++++ /dev/null
 @@ -1,56 +0,0 @@
 -/*
 - * PCIEHPRM NONACPI: PHP Resource Manager for Non-ACPI/Legacy platform
diff --git a/pci/pci-pciehp-04.patch b/pci/pci-pciehp-04.patch
index ca65298894f6e..f888ca76664f1 100644
--- a/pci/pci-pciehp-04.patch
+++ b/pci/pci-pciehp-04.patch
@@ -22,8 +22,9 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  drivers/pci/hotplug/pciehprm_nonacpi.c |   12 -------
  7 files changed, 41 insertions(+), 133 deletions(-)
 
---- gregkh-2.6.orig/drivers/pci/hotplug/pciehp.h	2005-11-02 10:57:13.000000000 -0800
-+++ gregkh-2.6/drivers/pci/hotplug/pciehp.h	2005-11-02 10:57:16.000000000 -0800
+---
+--- gregkh-2.6.orig/drivers/pci/hotplug/pciehp.h
++++ gregkh-2.6/drivers/pci/hotplug/pciehp.h
 @@ -32,8 +32,6 @@
  #include <linux/types.h>
  #include <linux/pci.h>
@@ -33,7 +34,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  #include <linux/pcieport_if.h>
  #include "pci_hotplug.h"
  
-@@ -62,13 +60,7 @@
+@@ -62,13 +60,7 @@ struct slot {
  	u8 device;
  	u16 status;
  	u32 number;
@@ -47,7 +48,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  	struct timer_list task_event;
  	u8 hp_slot;
  	struct controller *ctrl;
-@@ -82,27 +74,42 @@
+@@ -82,27 +74,42 @@ struct event_info {
  	u8 hp_slot;
  };
  
@@ -96,7 +97,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  	u32 first_slot;		/* First physical slot number */  /* PCIE only has 1 slot */
  	u8 slot_bus;		/* Bus where the slots handled by this controller sit */
  	u8 ctrlcap;
-@@ -250,14 +257,7 @@
+@@ -250,14 +257,7 @@ enum php_ctlr_type {
  	ACPI
  };
  
@@ -112,8 +113,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  
  /* This has no meaning for PCI Express, as there is only 1 slot per port */
  int pcie_get_ctlr_slot_config(struct controller *ctrl,
---- gregkh-2.6.orig/drivers/pci/hotplug/pciehp_core.c	2005-11-02 10:57:13.000000000 -0800
-+++ gregkh-2.6/drivers/pci/hotplug/pciehp_core.c	2005-11-02 10:57:16.000000000 -0800
+--- gregkh-2.6.orig/drivers/pci/hotplug/pciehp_core.c
++++ gregkh-2.6/drivers/pci/hotplug/pciehp_core.c
 @@ -27,17 +27,11 @@
   *
   */
@@ -132,7 +133,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  #include "pciehp.h"
  #include <linux/interrupt.h>
  
-@@ -381,11 +375,7 @@
+@@ -381,11 +375,7 @@ static int pciehp_probe(struct pcie_devi
  	pdev = dev->port;
  	ctrl->pci_dev = pdev;
  
@@ -145,7 +146,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  	if (rc) {
  		dbg("%s: controller initialization failed\n", PCIE_MODULE_NAME);
  		goto err_out_free_ctrl;
-@@ -421,8 +411,6 @@
+@@ -421,8 +411,6 @@ static int pciehp_probe(struct pcie_devi
  	first_device_num = ctrl->slot_device_offset;
  	num_ctlr_slots = ctrl->num_slots; 
  
@@ -154,8 +155,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  	/* Setup the slot information structures */
  	rc = init_slots(ctrl);
  	if (rc) {
---- gregkh-2.6.orig/drivers/pci/hotplug/pciehp_ctrl.c	2005-11-02 10:57:13.000000000 -0800
-+++ gregkh-2.6/drivers/pci/hotplug/pciehp_ctrl.c	2005-11-02 10:57:16.000000000 -0800
+--- gregkh-2.6.orig/drivers/pci/hotplug/pciehp_ctrl.c
++++ gregkh-2.6/drivers/pci/hotplug/pciehp_ctrl.c
 @@ -27,15 +27,9 @@
   *
   */
@@ -172,7 +173,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  #include <linux/smp_lock.h>
  #include <linux/pci.h>
  #include "../pci.h"
-@@ -64,10 +58,9 @@
+@@ -64,10 +58,9 @@ u8 pciehp_handle_attention_button(u8 hp_
  	taskInfo = &(ctrl->event_queue[ctrl->next_event]);
  	p_slot = pciehp_find_slot(ctrl, hp_slot + ctrl->slot_device_offset);
  
@@ -184,7 +185,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  	taskInfo->hp_slot = hp_slot;
  
  	rc++;
-@@ -118,12 +111,11 @@
+@@ -118,12 +111,11 @@ u8 pciehp_handle_switch_change(u8 hp_slo
  	 * what to do
  	 */
  	taskInfo = &(ctrl->event_queue[ctrl->next_event]);
@@ -198,7 +199,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  	p_slot->hpc_ops->get_latch_status(p_slot, &getstatus);
  
  	if (getstatus) {
-@@ -131,14 +123,12 @@
+@@ -131,14 +123,12 @@ u8 pciehp_handle_switch_change(u8 hp_slo
  		 * Switch opened
  		 */
  		info("Latch open on Slot(%d)\n", ctrl->first_slot + hp_slot);
@@ -213,7 +214,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  		taskInfo->event_type = INT_SWITCH_CLOSE;
  	}
  
-@@ -152,7 +142,7 @@
+@@ -152,7 +142,7 @@ u8 pciehp_handle_presence_change(u8 hp_s
  {
  	struct controller *ctrl = (struct controller *) inst_id;
  	struct slot *p_slot;
@@ -222,7 +223,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  	struct event_info *taskInfo;
  
  	/* Presence Change */
-@@ -162,7 +152,7 @@
+@@ -162,7 +152,7 @@ u8 pciehp_handle_presence_change(u8 hp_s
  	 * what to do
  	 */
  	taskInfo = &(ctrl->event_queue[ctrl->next_event]);
@@ -231,7 +232,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  	taskInfo->hp_slot = hp_slot;
  
  	rc++;
-@@ -171,8 +161,8 @@
+@@ -171,8 +161,8 @@ u8 pciehp_handle_presence_change(u8 hp_s
  	/* Switch is open, assume a presence change
  	 * Save the presence state
  	 */
@@ -242,7 +243,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  		/*
  		 * Card Present
  		 */
-@@ -206,7 +196,7 @@
+@@ -206,7 +196,7 @@ u8 pciehp_handle_power_fault(u8 hp_slot,
  	 * what to do
  	 */
  	taskInfo = &(ctrl->event_queue[ctrl->next_event]);
@@ -251,7 +252,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  	taskInfo->hp_slot = hp_slot;
  
  	rc++;
-@@ -279,11 +269,10 @@
+@@ -279,11 +269,10 @@ static void set_slot_off(struct controll
   * Configures board
   *
   */
@@ -265,7 +266,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  	struct controller *ctrl = p_slot->ctrl;
  
  	hp_slot = p_slot->device - ctrl->slot_device_offset;
-@@ -333,8 +322,6 @@
+@@ -333,8 +322,6 @@ static u32 board_added(struct slot *p_sl
  	/* Check for a power fault */
  	if (p_slot->status == 0xFF) {
  		/* power fault occurred, but it was benign */
@@ -274,7 +275,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  		rc = POWER_FAILURE;
  		p_slot->status = 0;
  		goto err_exit;
-@@ -348,8 +335,6 @@
+@@ -348,8 +335,6 @@ static u32 board_added(struct slot *p_sl
  	}
  
  	p_slot->status = 0;
@@ -283,7 +284,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  
  	/*
  	 * Some PCI Express root ports require fixup after hot-plug operation.
-@@ -380,11 +365,11 @@
+@@ -380,11 +365,11 @@ err_exit:
   * remove_board - Turns off slot and LED's
   *
   */
@@ -297,7 +298,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  	struct controller *ctrl = p_slot->ctrl;
  
  	if (pciehp_unconfigure_device(p_slot))
-@@ -398,9 +383,7 @@
+@@ -398,9 +383,7 @@ static u32 remove_board(struct slot *p_s
  	dbg("In %s, hp_slot = %d\n", __FUNCTION__, hp_slot);
  
  	/* Change status to shutdown */
@@ -308,7 +309,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  
  	/* Wait for exclusive access to hardware */
  	down(&ctrl->crit_sect);
-@@ -428,9 +411,6 @@
+@@ -428,9 +411,6 @@ static u32 remove_board(struct slot *p_s
  	/* Done with exclusive hardware access */
  	up(&ctrl->crit_sect);
  
@@ -318,7 +319,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  	return 0;
  }
  
-@@ -633,7 +613,7 @@
+@@ -633,7 +613,7 @@ static void interrupt_event_handler(stru
  	while (change) {
  		change = 0;
  
@@ -327,7 +328,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  			if (ctrl->event_queue[loop].event_type != 0) {
  				hp_slot = ctrl->event_queue[loop].hp_slot;
  
-@@ -816,21 +796,11 @@
+@@ -816,21 +796,11 @@ int pciehp_enable_slot(struct slot *p_sl
  	}
  	up(&p_slot->ctrl->crit_sect);
  
@@ -349,8 +350,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  	}
  
  	if (p_slot)
---- gregkh-2.6.orig/drivers/pci/hotplug/pciehp_hpc.c	2005-11-02 10:57:10.000000000 -0800
-+++ gregkh-2.6/drivers/pci/hotplug/pciehp_hpc.c	2005-11-02 10:57:16.000000000 -0800
+--- gregkh-2.6.orig/drivers/pci/hotplug/pciehp_hpc.c
++++ gregkh-2.6/drivers/pci/hotplug/pciehp_hpc.c
 @@ -27,16 +27,10 @@
   *
   */
@@ -368,7 +369,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  #include "../pci.h"
  #include "pciehp.h"
  
-@@ -217,23 +211,6 @@
+@@ -217,23 +211,6 @@ static int pcie_cap_base = 0;		/* Base o
  #define MRL_STATE		0x0020
  #define PRSN_STATE		0x0040
  
@@ -392,7 +393,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  static spinlock_t hpc_event_lock;
  
  DEFINE_DBG_BUFFER		/* Debug string buffer for entire HPC defined here */
-@@ -1248,12 +1225,7 @@
+@@ -1248,12 +1225,7 @@ static struct hpc_ops pciehp_hpc_ops = {
  	.check_lnk_status		= hpc_check_lnk_status,
  };
  
@@ -406,7 +407,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  {
  	struct php_ctlr_state_s *php_ctlr, *p;
  	void *instance_id = ctrl;
-@@ -1362,10 +1334,10 @@
+@@ -1362,10 +1334,10 @@ int pcie_init(struct controller * ctrl,
  	dbg("HPC interrupt = %d\n", php_ctlr->irq);
  
  	/* Save interrupt callback info */
@@ -421,8 +422,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  	php_ctlr->callback_instance_id = instance_id;
  
  	/* return PCI Controller Info */
---- gregkh-2.6.orig/drivers/pci/hotplug/pciehp_pci.c	2005-11-02 10:57:13.000000000 -0800
-+++ gregkh-2.6/drivers/pci/hotplug/pciehp_pci.c	2005-11-02 10:57:16.000000000 -0800
+--- gregkh-2.6.orig/drivers/pci/hotplug/pciehp_pci.c
++++ gregkh-2.6/drivers/pci/hotplug/pciehp_pci.c
 @@ -27,13 +27,9 @@
   *
   */
@@ -437,8 +438,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  #include <linux/pci.h>
  #include "../pci.h"
  #include "pciehp.h"
---- gregkh-2.6.orig/drivers/pci/hotplug/pciehprm_acpi.c	2005-11-02 10:57:10.000000000 -0800
-+++ gregkh-2.6/drivers/pci/hotplug/pciehprm_acpi.c	2005-11-02 10:57:16.000000000 -0800
+--- gregkh-2.6.orig/drivers/pci/hotplug/pciehprm_acpi.c
++++ gregkh-2.6/drivers/pci/hotplug/pciehprm_acpi.c
 @@ -24,18 +24,12 @@
   *
   */
@@ -458,9 +459,9 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  #include <acpi/acpi_bus.h>
  #include <acpi/actypes.h>
  #include "pciehp.h"
---- gregkh-2.6.orig/drivers/pci/hotplug/pciehprm_nonacpi.c	2005-11-02 10:57:10.000000000 -0800
-+++ gregkh-2.6/drivers/pci/hotplug/pciehprm_nonacpi.c	2005-11-02 10:58:13.000000000 -0800
-@@ -27,24 +27,12 @@
+--- gregkh-2.6.orig/drivers/pci/hotplug/pciehprm_nonacpi.c
++++ gregkh-2.6/drivers/pci/hotplug/pciehprm_nonacpi.c
+@@ -27,25 +27,13 @@
   *
   */
  
@@ -468,6 +469,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  #include <linux/module.h>
  #include <linux/kernel.h>
  #include <linux/types.h>
+ #include <linux/sched.h>
  #include <linux/pci.h>
 -#include <linux/init.h>
  #include <linux/slab.h>
diff --git a/pci/pci_driver_auto_set_owner.patch b/pci/pci_driver_auto_set_owner.patch
index 16ac57f7cc262..9b8542974cbcd 100644
--- a/pci/pci_driver_auto_set_owner.patch
+++ b/pci/pci_driver_auto_set_owner.patch
@@ -56,7 +56,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  static inline int pci_find_capability (struct pci_dev *dev, int cap) {return 0; }
 --- gregkh-2.6.orig/drivers/pci/pci-driver.c
 +++ gregkh-2.6/drivers/pci/pci-driver.c
-@@ -363,15 +363,16 @@ static struct kobj_type pci_driver_kobj_
+@@ -364,15 +364,16 @@ static struct kobj_type pci_driver_kobj_
  };
  
  /**
@@ -75,7 +75,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  {
  	int error;
  
-@@ -388,7 +389,7 @@ int pci_register_driver(struct pci_drive
+@@ -389,7 +390,7 @@ int pci_register_driver(struct pci_drive
  		printk(KERN_WARNING "Warning: PCI driver %s has a struct "
  			"device_driver shutdown method, please update!\n",
  			drv->name);
@@ -84,7 +84,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  	drv->driver.kobj.ktype = &pci_driver_kobj_type;
  
  	spin_lock_init(&drv->dynids.lock);
-@@ -525,7 +526,7 @@ postcore_initcall(pci_driver_init);
+@@ -526,7 +527,7 @@ postcore_initcall(pci_driver_init);
  
  EXPORT_SYMBOL(pci_match_id);
  EXPORT_SYMBOL(pci_match_device);