summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--devfs/devfs-remove-devfs_mk_bdev.patch4
-rw-r--r--devfs/devfs-remove-devfs_mk_dir.patch2
-rw-r--r--devfs/devfs-remove-devfs_remove.patch2
-rw-r--r--driver/driver-model-get-rid-of-the-obsolete-tri-level-suspend-resume-callbacks.patch2
-rw-r--r--i2c/i2c-smbus-pec-01-drop-pec-funcs.patch8
-rw-r--r--i2c/i2c-smbus-pec-02-swpec-rewrite.patch2
-rw-r--r--i2c/i2c-smbus-pec-03-drop-swpec-sizes.patch2
-rw-r--r--pci/pci-fix-edac-drivers-for-radisys-82600-borkage.patch2
-rw-r--r--pci/pci-ich6-acpi-quirk.patch2
-rw-r--r--pci/pci-ich6-smbus-quirk.patch6
-rw-r--r--pci/pci-ids-01.patch8
-rw-r--r--pci/pci-ids-03.patch127
-rw-r--r--pci/pci-quirk-hpd530.patch2
-rw-r--r--pci/pci_ids-cleanup-comments.patch4
-rw-r--r--series35
-rw-r--r--usb/usb-always-do-usb-handoff.patch4
-rw-r--r--usb/usb-handoff-merge.patch4
-rw-r--r--usb/usb-use-notifier-inode.patch2
-rw-r--r--usb/usb-use-notifier-usbmon.patch6
19 files changed, 112 insertions, 112 deletions
diff --git a/devfs/devfs-remove-devfs_mk_bdev.patch b/devfs/devfs-remove-devfs_mk_bdev.patch
index 96c814432c5eb1..3b27f1d2fda98f 100644
--- a/devfs/devfs-remove-devfs_mk_bdev.patch
+++ b/devfs/devfs-remove-devfs_mk_bdev.patch
@@ -97,7 +97,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
return 0;
--- gregkh-2.6.orig/drivers/md/md.c
+++ gregkh-2.6/drivers/md/md.c
-@@ -3967,8 +3967,6 @@ static void md_geninit(void)
+@@ -3969,8 +3969,6 @@ static void md_geninit(void)
static int __init md_init(void)
{
@@ -106,7 +106,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
printk(KERN_INFO "md: md driver %d.%d.%d MAX_MD_DEVS=%d,"
" MD_SB_DISKS=%d\n",
MD_MAJOR_VERSION, MD_MINOR_VERSION,
-@@ -3987,17 +3985,6 @@ static int __init md_init(void)
+@@ -3989,17 +3987,6 @@ static int __init md_init(void)
blk_register_region(MKDEV(mdp_major, 0), MAX_MD_DEVS<<MdpMinorShift, THIS_MODULE,
md_probe, NULL, NULL);
diff --git a/devfs/devfs-remove-devfs_mk_dir.patch b/devfs/devfs-remove-devfs_mk_dir.patch
index 329632583ede8d..9fba6642a7fe46 100644
--- a/devfs/devfs-remove-devfs_mk_dir.patch
+++ b/devfs/devfs-remove-devfs_mk_dir.patch
@@ -315,7 +315,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
struct cdrom_device_info * sbpcd_infop;
--- gregkh-2.6.orig/drivers/md/md.c
+++ gregkh-2.6/drivers/md/md.c
-@@ -3982,7 +3982,6 @@ static int __init md_init(void)
+@@ -3984,7 +3984,6 @@ static int __init md_init(void)
unregister_blkdev(MAJOR_NR, "md");
return -1;
}
diff --git a/devfs/devfs-remove-devfs_remove.patch b/devfs/devfs-remove-devfs_remove.patch
index 65ca592d48bc8a..73b08d82ebb383 100644
--- a/devfs/devfs-remove-devfs_remove.patch
+++ b/devfs/devfs-remove-devfs_remove.patch
@@ -369,7 +369,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
hc->name = new_name;
--- gregkh-2.6.orig/drivers/md/md.c
+++ gregkh-2.6/drivers/md/md.c
-@@ -4040,15 +4040,9 @@ static __exit void md_exit(void)
+@@ -4042,15 +4042,9 @@ static __exit void md_exit(void)
{
mddev_t *mddev;
struct list_head *tmp;
diff --git a/driver/driver-model-get-rid-of-the-obsolete-tri-level-suspend-resume-callbacks.patch b/driver/driver-model-get-rid-of-the-obsolete-tri-level-suspend-resume-callbacks.patch
index 524e1a5433790a..948dc29216ec89 100644
--- a/driver/driver-model-get-rid-of-the-obsolete-tri-level-suspend-resume-callbacks.patch
+++ b/driver/driver-model-get-rid-of-the-obsolete-tri-level-suspend-resume-callbacks.patch
@@ -2305,7 +2305,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
card = get_snd_generic_card(dev);
if (card->power_state == SNDRV_CTL_POWER_D3hot)
return 0;
-@@ -833,13 +830,10 @@ static int snd_generic_suspend(struct de
+@@ -834,13 +831,10 @@ static int snd_generic_suspend(struct de
return 0;
}
diff --git a/i2c/i2c-smbus-pec-01-drop-pec-funcs.patch b/i2c/i2c-smbus-pec-01-drop-pec-funcs.patch
index cee690506f7740..b0b4cde17bc7e8 100644
--- a/i2c/i2c-smbus-pec-01-drop-pec-funcs.patch
+++ b/i2c/i2c-smbus-pec-01-drop-pec-funcs.patch
@@ -20,7 +20,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
--- gregkh-2.6.orig/include/linux/i2c.h
+++ gregkh-2.6/include/linux/i2c.h
-@@ -390,10 +390,6 @@ struct i2c_msg {
+@@ -389,10 +389,6 @@ struct i2c_msg {
#define I2C_FUNC_10BIT_ADDR 0x00000002
#define I2C_FUNC_PROTOCOL_MANGLING 0x00000004 /* I2C_M_{REV_DIR_ADDR,NOSTART,..} */
#define I2C_FUNC_SMBUS_HWPEC_CALC 0x00000008 /* SMBus 2.0 */
@@ -31,7 +31,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
#define I2C_FUNC_SMBUS_BLOCK_PROC_CALL 0x00008000 /* SMBus 2.0 */
#define I2C_FUNC_SMBUS_QUICK 0x00010000
#define I2C_FUNC_SMBUS_READ_BYTE 0x00020000
-@@ -409,8 +405,6 @@ struct i2c_msg {
+@@ -408,8 +404,6 @@ struct i2c_msg {
#define I2C_FUNC_SMBUS_WRITE_I2C_BLOCK 0x08000000 /* w/ 1-byte reg. addr. */
#define I2C_FUNC_SMBUS_READ_I2C_BLOCK_2 0x10000000 /* I2C-like block xfer */
#define I2C_FUNC_SMBUS_WRITE_I2C_BLOCK_2 0x20000000 /* w/ 2-byte reg. addr. */
@@ -40,7 +40,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
#define I2C_FUNC_SMBUS_BYTE (I2C_FUNC_SMBUS_READ_BYTE | \
I2C_FUNC_SMBUS_WRITE_BYTE)
-@@ -424,17 +418,6 @@ struct i2c_msg {
+@@ -423,17 +417,6 @@ struct i2c_msg {
I2C_FUNC_SMBUS_WRITE_I2C_BLOCK)
#define I2C_FUNC_SMBUS_I2C_BLOCK_2 (I2C_FUNC_SMBUS_READ_I2C_BLOCK_2 | \
I2C_FUNC_SMBUS_WRITE_I2C_BLOCK_2)
@@ -58,7 +58,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
#define I2C_FUNC_SMBUS_EMUL (I2C_FUNC_SMBUS_QUICK | \
I2C_FUNC_SMBUS_BYTE | \
-@@ -442,7 +425,6 @@ struct i2c_msg {
+@@ -441,7 +424,6 @@ struct i2c_msg {
I2C_FUNC_SMBUS_WORD_DATA | \
I2C_FUNC_SMBUS_PROC_CALL | \
I2C_FUNC_SMBUS_WRITE_BLOCK_DATA | \
diff --git a/i2c/i2c-smbus-pec-02-swpec-rewrite.patch b/i2c/i2c-smbus-pec-02-swpec-rewrite.patch
index 2d2673523d2f3e..d9814fc61d637c 100644
--- a/i2c/i2c-smbus-pec-02-swpec-rewrite.patch
+++ b/i2c/i2c-smbus-pec-02-swpec-rewrite.patch
@@ -322,7 +322,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
--- gregkh-2.6.orig/include/linux/i2c.h
+++ gregkh-2.6/include/linux/i2c.h
-@@ -435,7 +435,7 @@ union i2c_smbus_data {
+@@ -434,7 +434,7 @@ union i2c_smbus_data {
__u8 byte;
__u16 word;
__u8 block[I2C_SMBUS_BLOCK_MAX + 2]; /* block[0] is used for length */
diff --git a/i2c/i2c-smbus-pec-03-drop-swpec-sizes.patch b/i2c/i2c-smbus-pec-03-drop-swpec-sizes.patch
index 4b592a0e809b4f..0f451cd386c048 100644
--- a/i2c/i2c-smbus-pec-03-drop-swpec-sizes.patch
+++ b/i2c/i2c-smbus-pec-03-drop-swpec-sizes.patch
@@ -53,7 +53,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
return -1;
--- gregkh-2.6.orig/include/linux/i2c.h
+++ gregkh-2.6/include/linux/i2c.h
-@@ -452,10 +452,6 @@ union i2c_smbus_data {
+@@ -451,10 +451,6 @@ union i2c_smbus_data {
#define I2C_SMBUS_BLOCK_DATA 5
#define I2C_SMBUS_I2C_BLOCK_DATA 6
#define I2C_SMBUS_BLOCK_PROC_CALL 7 /* SMBus 2.0 */
diff --git a/pci/pci-fix-edac-drivers-for-radisys-82600-borkage.patch b/pci/pci-fix-edac-drivers-for-radisys-82600-borkage.patch
index a27c03150f957f..2a4695d9866638 100644
--- a/pci/pci-fix-edac-drivers-for-radisys-82600-borkage.patch
+++ b/pci/pci-fix-edac-drivers-for-radisys-82600-borkage.patch
@@ -19,7 +19,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
--- gregkh-2.6.orig/include/linux/pci_ids.h
+++ gregkh-2.6/include/linux/pci_ids.h
-@@ -1609,6 +1609,7 @@
+@@ -1610,6 +1610,7 @@
#define PCI_DEVICE_ID_SIIG_2S1P_20x_850 0x2062
#define PCI_SUBDEVICE_ID_SIIG_QUARTET_SERIAL 0x2050
diff --git a/pci/pci-ich6-acpi-quirk.patch b/pci/pci-ich6-acpi-quirk.patch
index 41cd3f16a8c0c3..827997e7b8224d 100644
--- a/pci/pci-ich6-acpi-quirk.patch
+++ b/pci/pci-ich6-acpi-quirk.patch
@@ -19,7 +19,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---
--- gregkh-2.6.orig/drivers/pci/quirks.c
+++ gregkh-2.6/drivers/pci/quirks.c
-@@ -339,6 +339,18 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_I
+@@ -414,6 +414,18 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_I
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801EB_0, quirk_ich4_lpc_acpi );
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ESB_1, quirk_ich4_lpc_acpi );
diff --git a/pci/pci-ich6-smbus-quirk.patch b/pci/pci-ich6-smbus-quirk.patch
index d35c6d1455013c..6db4f5a321083e 100644
--- a/pci/pci-ich6-smbus-quirk.patch
+++ b/pci/pci-ich6-smbus-quirk.patch
@@ -19,7 +19,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---
--- gregkh-2.6.orig/drivers/pci/quirks.c
+++ gregkh-2.6/drivers/pci/quirks.c
-@@ -859,6 +859,12 @@ static void __init asus_hides_smbus_host
+@@ -934,6 +934,12 @@ static void __init asus_hides_smbus_host
case 0x186a: /* M6Ne notebook */
asus_hides_smbus = 1;
}
@@ -32,7 +32,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
} else if (unlikely(dev->subsystem_vendor == PCI_VENDOR_ID_HP)) {
if (dev->device == PCI_DEVICE_ID_INTEL_82855PM_HB)
switch(dev->subsystem_device) {
-@@ -903,6 +909,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_I
+@@ -978,6 +984,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_I
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_7205_0, asus_hides_smbus_hostbridge );
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82855PM_HB, asus_hides_smbus_hostbridge );
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82855GM_HB, asus_hides_smbus_hostbridge );
@@ -40,7 +40,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
static void __init asus_hides_smbus_lpc(struct pci_dev *dev)
{
-@@ -927,6 +934,23 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_I
+@@ -1002,6 +1009,23 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_I
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801DB_12, asus_hides_smbus_lpc );
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801EB_0, asus_hides_smbus_lpc );
diff --git a/pci/pci-ids-01.patch b/pci/pci-ids-01.patch
index ee133f6419c7fc..b893a5ddd7bdbf 100644
--- a/pci/pci-ids-01.patch
+++ b/pci/pci-ids-01.patch
@@ -60,7 +60,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
#define PCI_VENDOR_ID_MIRO 0x1031
#define PCI_DEVICE_ID_MIRO_36050 0x5601
-@@ -1196,7 +1194,6 @@
+@@ -1197,7 +1195,6 @@
#define PCI_DEVICE_ID_QUADRO_FX_GO1400 0x00cc
#define PCI_DEVICE_ID_QUADRO_FX_1400 0x00ce
#define PCI_DEVICE_ID_NVIDIA_NFORCE3 0x00d1
@@ -68,7 +68,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
#define PCI_DEVICE_ID_NVIDIA_NFORCE3_SMBUS 0x00d4
#define PCI_DEVICE_ID_NVIDIA_NFORCE3_IDE 0x00d5
#define PCI_DEVICE_ID_NVIDIA_NVENET_3 0x00d6
-@@ -1622,7 +1619,7 @@
+@@ -1623,7 +1620,7 @@
#define PCI_DEVICE_ID_SERVERWORKS_HT1000IDE 0x0214
#define PCI_DEVICE_ID_SERVERWORKS_CSB6IDE2 0x0217
#define PCI_DEVICE_ID_SERVERWORKS_OSB4USB 0x0220
@@ -77,7 +77,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
#define PCI_DEVICE_ID_SERVERWORKS_CSB6USB 0x0221
#define PCI_DEVICE_ID_SERVERWORKS_CSB6LPC 0x0227
#define PCI_DEVICE_ID_SERVERWORKS_GCLE 0x0225
-@@ -1791,10 +1788,6 @@
+@@ -1792,10 +1789,6 @@
#define PCI_DEVICE_ID_PC300_TE_M_2 0x0320
#define PCI_DEVICE_ID_PC300_TE_M_1 0x0321
@@ -88,7 +88,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
#define PCI_VENDOR_ID_ESSENTIAL 0x120f
#define PCI_DEVICE_ID_ESSENTIAL_ROADRUNNER 0x0001
-@@ -2339,16 +2332,13 @@
+@@ -2340,16 +2333,13 @@
#define PCI_VENDOR_ID_DUNORD 0x5544
#define PCI_DEVICE_ID_DUNORD_I3000 0x0001
diff --git a/pci/pci-ids-03.patch b/pci/pci-ids-03.patch
index c232c023527baf..13431f911f1941 100644
--- a/pci/pci-ids-03.patch
+++ b/pci/pci-ids-03.patch
@@ -211,7 +211,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
#define PCI_DEVICE_ID_SI_7012 0x7012
#define PCI_DEVICE_ID_SI_7013 0x7013
#define PCI_DEVICE_ID_SI_7016 0x7016
-@@ -707,23 +643,18 @@
+@@ -707,14 +643,11 @@
#define PCI_DEVICE_ID_HP_DIVA_TOSCA1 0x1049
#define PCI_DEVICE_ID_HP_DIVA_TOSCA2 0x104A
#define PCI_DEVICE_ID_HP_DIVA_MAESTRO 0x104B
@@ -226,16 +226,17 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
#define PCI_DEVICE_ID_HP_ZX1_IOC 0x122a
#define PCI_DEVICE_ID_HP_PCIX_LBA 0x122e
#define PCI_DEVICE_ID_HP_SX1000_IOC 0x127c
- #define PCI_DEVICE_ID_HP_DIVA_EVEREST 0x1282
+@@ -722,9 +655,7 @@
#define PCI_DEVICE_ID_HP_DIVA_AUX 0x1290
#define PCI_DEVICE_ID_HP_DIVA_RMP3 0x1301
+ #define PCI_DEVICE_ID_HP_DIVA_HURRICANE 0x132a
-#define PCI_DEVICE_ID_HP_CISS 0x3210
#define PCI_DEVICE_ID_HP_CISSA 0x3220
-#define PCI_DEVICE_ID_HP_CISSB 0x3222
#define PCI_DEVICE_ID_HP_CISSC 0x3230
#define PCI_DEVICE_ID_HP_CISSD 0x3238
#define PCI_DEVICE_ID_HP_ZX2_IOC 0x4031
-@@ -731,8 +662,6 @@
+@@ -732,8 +663,6 @@
#define PCI_VENDOR_ID_PCTECH 0x1042
#define PCI_DEVICE_ID_PCTECH_RZ1000 0x1000
#define PCI_DEVICE_ID_PCTECH_RZ1001 0x1001
@@ -244,7 +245,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
#define PCI_DEVICE_ID_PCTECH_SAMURAI_IDE 0x3020
#define PCI_VENDOR_ID_ASUSTEK 0x1043
-@@ -742,24 +671,15 @@
+@@ -743,24 +672,15 @@
#define PCI_DEVICE_ID_DPT 0xa400
#define PCI_VENDOR_ID_OPTI 0x1045
@@ -269,7 +270,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
#define PCI_VENDOR_ID_BUSLOGIC 0x104B
#define PCI_DEVICE_ID_BUSLOGIC_MULTIMASTER_NC 0x0140
-@@ -767,7 +687,6 @@
+@@ -768,7 +688,6 @@
#define PCI_DEVICE_ID_BUSLOGIC_FLASHPOINT 0x8130
#define PCI_VENDOR_ID_TI 0x104c
@@ -277,7 +278,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
#define PCI_DEVICE_ID_TI_TVP4020 0x3d07
#define PCI_DEVICE_ID_TI_4450 0x8011
#define PCI_DEVICE_ID_TI_XX21_XX11 0x8031
-@@ -801,14 +720,10 @@
+@@ -802,14 +721,10 @@
#define PCI_DEVICE_ID_TI_X420 0xac8e
#define PCI_VENDOR_ID_SONY 0x104d
@@ -292,7 +293,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
#define PCI_DEVICE_ID_WINBOND2_89C940F 0x5a5a
#define PCI_DEVICE_ID_WINBOND2_6692 0x6692
-@@ -817,19 +732,15 @@
+@@ -818,19 +733,15 @@
#define PCI_VENDOR_ID_EFAR 0x1055
#define PCI_DEVICE_ID_EFAR_SLC90E66_1 0x9130
@@ -312,7 +313,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
#define PCI_DEVICE_ID_MOTOROLA_HARRIER 0x480b
#define PCI_DEVICE_ID_MOTOROLA_MPC5200 0x5803
-@@ -840,33 +751,19 @@
+@@ -841,33 +752,19 @@
#define PCI_DEVICE_ID_PROMISE_20262 0x4d38
#define PCI_DEVICE_ID_PROMISE_20263 0x0D38
#define PCI_DEVICE_ID_PROMISE_20268 0x4d68
@@ -346,7 +347,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
#define PCI_VENDOR_ID_MYLEX 0x1069
#define PCI_DEVICE_ID_MYLEX_DAC960_P 0x0001
-@@ -877,37 +774,26 @@
+@@ -878,37 +775,26 @@
#define PCI_DEVICE_ID_MYLEX_DAC960_BA 0xBA56
#define PCI_DEVICE_ID_MYLEX_DAC960_GEM 0xB166
@@ -384,7 +385,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
#define PCI_DEVICE_ID_APPLE_U3L_AGP 0x0058
#define PCI_DEVICE_ID_APPLE_U3H_AGP 0x0059
#define PCI_DEVICE_ID_APPLE_TIGON3 0x1645
-@@ -920,12 +806,9 @@
+@@ -921,12 +807,9 @@
#define PCI_DEVICE_ID_YAMAHA_744 0x0010
#define PCI_DEVICE_ID_YAMAHA_754 0x0012
@@ -397,7 +398,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
#define PCI_DEVICE_ID_QLOGIC_ISP2100 0x2100
#define PCI_DEVICE_ID_QLOGIC_ISP2200 0x2200
#define PCI_DEVICE_ID_QLOGIC_ISP2300 0x2300
-@@ -943,32 +826,20 @@
+@@ -944,32 +827,20 @@
#define PCI_DEVICE_ID_CYRIX_PCI_MASTER 0x0001
#define PCI_DEVICE_ID_CYRIX_5520 0x0002
#define PCI_DEVICE_ID_CYRIX_5530_LEGACY 0x0100
@@ -430,7 +431,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
#define PCI_VENDOR_ID_SUN 0x108e
#define PCI_DEVICE_ID_SUN_EBUS 0x1000
-@@ -987,49 +858,31 @@
+@@ -988,49 +859,31 @@
#define PCI_DEVICE_ID_SUN_CASSINI 0xabba
#define PCI_VENDOR_ID_CMD 0x1095
@@ -480,7 +481,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
#define PCI_VENDOR_ID_PLX 0x10b5
#define PCI_DEVICE_ID_PLX_R685 0x1030
-@@ -1040,33 +893,19 @@
+@@ -1041,33 +894,19 @@
#define PCI_DEVICE_ID_PLX_DJINN_ITOO 0x1151
#define PCI_DEVICE_ID_PLX_R753 0x1152
#define PCI_DEVICE_ID_PLX_OLITEC 0x1187
@@ -514,7 +515,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
#define PCI_DEVICE_ID_3COM_3CR990 0x9900
#define PCI_DEVICE_ID_3COM_3CR990_TX_95 0x9902
#define PCI_DEVICE_ID_3COM_3CR990_TX_97 0x9903
-@@ -1076,24 +915,11 @@
+@@ -1077,24 +916,11 @@
#define PCI_DEVICE_ID_3COM_3CR990SVR97 0x9909
#define PCI_DEVICE_ID_3COM_3CR990SVR 0x990a
@@ -539,7 +540,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
#define PCI_DEVICE_ID_AL_M1563 0x1563
#define PCI_DEVICE_ID_AL_M1621 0x1621
#define PCI_DEVICE_ID_AL_M1631 0x1631
-@@ -1106,49 +932,23 @@
+@@ -1107,49 +933,23 @@
#define PCI_DEVICE_ID_AL_M1681 0x1681
#define PCI_DEVICE_ID_AL_M1683 0x1683
#define PCI_DEVICE_ID_AL_M1689 0x1689
@@ -589,7 +590,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
#define PCI_VENDOR_ID_NVIDIA 0x10de
#define PCI_DEVICE_ID_NVIDIA_TNT 0x0020
-@@ -1280,7 +1080,6 @@
+@@ -1281,7 +1081,6 @@
#define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP55_SATA2 0x037F
#define PCI_DEVICE_ID_NVIDIA_NVENET_12 0x0268
#define PCI_DEVICE_ID_NVIDIA_NVENET_13 0x0269
@@ -597,7 +598,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
#define PCI_DEVICE_ID_NVIDIA_GEFORCE4_TI_4800 0x0280
#define PCI_DEVICE_ID_NVIDIA_GEFORCE4_TI_4800_8X 0x0281
#define PCI_DEVICE_ID_NVIDIA_GEFORCE4_TI_4800SE 0x0282
-@@ -1331,24 +1130,13 @@
+@@ -1332,24 +1131,13 @@
#define PCI_DEVICE_ID_NVIDIA_NVENET_15 0x0373
#define PCI_VENDOR_ID_IMS 0x10e0
@@ -622,7 +623,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
#define PCI_DEVICE_ID_INTERG_1682 0x1682
#define PCI_DEVICE_ID_INTERG_2000 0x2000
#define PCI_DEVICE_ID_INTERG_2010 0x2010
-@@ -1356,27 +1144,18 @@
+@@ -1357,27 +1145,18 @@
#define PCI_DEVICE_ID_INTERG_5050 0x5050
#define PCI_VENDOR_ID_REALTEK 0x10ec
@@ -650,7 +651,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
#define PCI_VENDOR_ID_CREATIVE 0x1102 // duplicate: ECTIVA
#define PCI_DEVICE_ID_CREATIVE_EMU10K1 0x0002
-@@ -1404,36 +1183,25 @@
+@@ -1405,36 +1184,25 @@
#define PCI_DEVICE_ID_VIA_8363_0 0x0305
#define PCI_DEVICE_ID_VIA_8371_0 0x0391
#define PCI_DEVICE_ID_VIA_8501_0 0x0501
@@ -687,7 +688,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
#define PCI_DEVICE_ID_VIA_8233_0 0x3074
#define PCI_DEVICE_ID_VIA_8633_0 0x3091
#define PCI_DEVICE_ID_VIA_8367_0 0x3099
-@@ -1451,38 +1219,23 @@
+@@ -1452,38 +1220,23 @@
#define PCI_DEVICE_ID_VIA_XN266 0x3156
#define PCI_DEVICE_ID_VIA_8754C_0 0x3168
#define PCI_DEVICE_ID_VIA_8235 0x3177
@@ -726,7 +727,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
#define PCI_VENDOR_ID_VORTEX 0x1119
#define PCI_DEVICE_ID_VORTEX_GDT60x0 0x0000
-@@ -1505,18 +1258,6 @@
+@@ -1506,18 +1259,6 @@
#define PCI_DEVICE_ID_VORTEX_GDT6557RP 0x0103
#define PCI_DEVICE_ID_VORTEX_GDT6x11RP 0x0104
#define PCI_DEVICE_ID_VORTEX_GDT6x21RP 0x0105
@@ -745,7 +746,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
#define PCI_VENDOR_ID_EF 0x111a
#define PCI_DEVICE_ID_EF_ATM_FPGA 0x0000
-@@ -1528,21 +1269,15 @@
+@@ -1529,21 +1270,15 @@
#define PCI_DEVICE_ID_IDT_IDT77201 0x0001
#define PCI_VENDOR_ID_FORE 0x1127
@@ -767,7 +768,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
#define PCI_DEVICE_ID_EICON_DIVA20_U 0xe004
#define PCI_DEVICE_ID_EICON_DIVA201 0xe005
#define PCI_DEVICE_ID_EICON_DIVA202 0xe00b
-@@ -1554,35 +1289,17 @@
+@@ -1555,35 +1290,17 @@
#define PCI_VENDOR_ID_ZIATECH 0x1138
#define PCI_DEVICE_ID_ZIATECH_5550_HC 0x5550
@@ -803,7 +804,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
#define PCI_DEVICE_ID_DIGI_DF_M_IOM2_E 0x0070
#define PCI_DEVICE_ID_DIGI_DF_M_E 0x0071
#define PCI_DEVICE_ID_DIGI_DF_M_IOM2_A 0x0072
-@@ -1592,23 +1309,15 @@
+@@ -1593,23 +1310,15 @@
#define PCI_DEVICE_ID_NEO_2RJ45 0x00CA
#define PCI_DEVICE_ID_NEO_2RJ45PRI 0x00CB
@@ -827,7 +828,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
#define PCI_DEVICE_ID_SERVERWORKS_GCNB_LE 0x0017
#define PCI_DEVICE_ID_SERVERWORKS_OSB4 0x0200
#define PCI_DEVICE_ID_SERVERWORKS_CSB5 0x0201
-@@ -1618,13 +1327,7 @@
+@@ -1619,13 +1328,7 @@
#define PCI_DEVICE_ID_SERVERWORKS_CSB6IDE 0x0213
#define PCI_DEVICE_ID_SERVERWORKS_HT1000IDE 0x0214
#define PCI_DEVICE_ID_SERVERWORKS_CSB6IDE2 0x0217
@@ -841,7 +842,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
#define PCI_VENDOR_ID_SBE 0x1176
#define PCI_DEVICE_ID_SBE_WANXL100 0x0301
-@@ -1635,17 +1338,12 @@
+@@ -1636,17 +1339,12 @@
#define PCI_DEVICE_ID_TOSHIBA_PICCOLO 0x0102
#define PCI_DEVICE_ID_TOSHIBA_PICCOLO_1 0x0103
#define PCI_DEVICE_ID_TOSHIBA_PICCOLO_2 0x0105
@@ -859,7 +860,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
#define PCI_DEVICE_ID_TOSHIBA_TC86C001_MISC 0x0108
#define PCI_DEVICE_ID_TOSHIBA_SPIDER_NET 0x01b3
-@@ -1660,7 +1358,6 @@
+@@ -1661,7 +1359,6 @@
#define PCI_DEVICE_ID_DLINK_DGE510T 0x4c00
#define PCI_VENDOR_ID_ARTOP 0x1191
@@ -867,7 +868,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
#define PCI_DEVICE_ID_ARTOP_ATP850UF 0x0005
#define PCI_DEVICE_ID_ARTOP_ATP860 0x0006
#define PCI_DEVICE_ID_ARTOP_ATP860R 0x0007
-@@ -1673,16 +1370,11 @@
+@@ -1674,16 +1371,11 @@
#define PCI_DEVICE_ID_ARTOP_AEC7612D 0x8040
#define PCI_DEVICE_ID_ARTOP_AEC7612SUW 0x8050
#define PCI_DEVICE_ID_ARTOP_8060 0x8060
@@ -884,7 +885,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
#define PCI_VENDOR_ID_FUJITSU_ME 0x119e
#define PCI_DEVICE_ID_FUJITSU_FS155 0x0001
-@@ -1692,61 +1384,41 @@
+@@ -1693,61 +1385,41 @@
#define PCI_SUBDEVICE_ID_KEYSPAN_SX2 0x5334
#define PCI_VENDOR_ID_MARVELL 0x11ab
@@ -946,7 +947,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
#define PCI_VENDOR_ID_RP 0x11fe
#define PCI_DEVICE_ID_RP32INTF 0x0001
-@@ -1760,7 +1432,6 @@
+@@ -1761,7 +1433,6 @@
#define PCI_DEVICE_ID_RP16SNI 0x0009
#define PCI_DEVICE_ID_RPP4 0x000A
#define PCI_DEVICE_ID_RPP8 0x000B
@@ -954,7 +955,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
#define PCI_DEVICE_ID_RP4M 0x000D
#define PCI_DEVICE_ID_RP2_232 0x000E
#define PCI_DEVICE_ID_RP2_422 0x000F
-@@ -1804,10 +1475,7 @@
+@@ -1805,10 +1476,7 @@
#define PCI_DEVICE_ID_3DFX_VOODOO3 0x0005
#define PCI_DEVICE_ID_3DFX_VOODOO5 0x0009
@@ -965,7 +966,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
#define PCI_VENDOR_ID_AVM 0x1244
#define PCI_DEVICE_ID_AVM_B1 0x0700
-@@ -1817,19 +1485,8 @@
+@@ -1818,19 +1486,8 @@
#define PCI_DEVICE_ID_AVM_C2 0x1100
#define PCI_DEVICE_ID_AVM_T1 0x1200
@@ -985,7 +986,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
/* Allied Telesyn */
#define PCI_VENDOR_ID_AT 0x1259
-@@ -1838,7 +1495,6 @@
+@@ -1839,7 +1496,6 @@
#define PCI_VENDOR_ID_ESS 0x125d
#define PCI_DEVICE_ID_ESS_ESS1968 0x1968
@@ -993,7 +994,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
#define PCI_DEVICE_ID_ESS_ESS1978 0x1978
#define PCI_DEVICE_ID_ESS_ALLEGRO_1 0x1988
#define PCI_DEVICE_ID_ESS_ALLEGRO 0x1989
-@@ -1851,11 +1507,7 @@
+@@ -1852,11 +1508,7 @@
#define PCI_VENDOR_ID_SATSAGEM 0x1267
#define PCI_DEVICE_ID_SATSAGEM_NICCY 0x1016
@@ -1005,7 +1006,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
#define PCI_VENDOR_ID_ENSONIQ 0x1274
#define PCI_DEVICE_ID_ENSONIQ_CT5880 0x5880
-@@ -1876,13 +1528,10 @@
+@@ -1877,13 +1529,10 @@
#define PCI_DEVICE_ID_ITE_IT8330G_0 0xe886
/* formerly Platform Tech */
@@ -1019,7 +1020,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
#define PCI_SUBVENDOR_ID_CONNECT_TECH 0x12c4
#define PCI_SUBDEVICE_ID_CONNECT_TECH_BH8_232 0x0001
-@@ -1897,8 +1546,6 @@
+@@ -1898,8 +1547,6 @@
#define PCI_SUBDEVICE_ID_CONNECT_TECH_BH081101V1 0x000A
#define PCI_SUBDEVICE_ID_CONNECT_TECH_BH041101V1 0x000B
@@ -1028,7 +1029,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
#define PCI_VENDOR_ID_NVIDIA_SGS 0x12d2
#define PCI_DEVICE_ID_NVIDIA_SGS_RIVA128 0x0018
-@@ -1920,8 +1567,6 @@
+@@ -1921,8 +1568,6 @@
#define PCI_VENDOR_ID_ELECTRONICDESIGNGMBH 0x12f8
#define PCI_DEVICE_ID_LML_33R10 0x8a02
@@ -1037,7 +1038,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
#define PCI_VENDOR_ID_SIIG 0x131f
#define PCI_SUBVENDOR_ID_SIIG 0x131f
-@@ -1964,8 +1609,6 @@
+@@ -1965,8 +1610,6 @@
#define PCI_DEVICE_ID_SIIG_2S1P_20x_850 0x2062
#define PCI_SUBDEVICE_ID_SIIG_QUARTET_SERIAL 0x2050
@@ -1046,7 +1047,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
#define PCI_VENDOR_ID_DOMEX 0x134a
#define PCI_DEVICE_ID_DOMEX_DMX3191D 0x0001
-@@ -1973,8 +1616,6 @@
+@@ -1974,8 +1617,6 @@
#define PCI_VENDOR_ID_QUATECH 0x135C
#define PCI_DEVICE_ID_QUATECH_QSC100 0x0010
#define PCI_DEVICE_ID_QUATECH_DSC100 0x0020
@@ -1055,7 +1056,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
#define PCI_DEVICE_ID_QUATECH_ESC100D 0x0050
#define PCI_DEVICE_ID_QUATECH_ESC100M 0x0060
-@@ -1993,7 +1634,6 @@
+@@ -1994,7 +1635,6 @@
#define PCI_SUBDEVICE_ID_HYPERCOPE_ERGO 0x0106
#define PCI_SUBDEVICE_ID_HYPERCOPE_METRO 0x0107
#define PCI_SUBDEVICE_ID_HYPERCOPE_CHAMP2 0x0108
@@ -1063,7 +1064,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
#define PCI_VENDOR_ID_KAWASAKI 0x136b
#define PCI_DEVICE_ID_MCHIP_KL5A72002 0xff01
-@@ -2007,12 +1647,9 @@
+@@ -2008,12 +1648,9 @@
#define PCI_DEVICE_ID_LMC_SSI 0x0005
#define PCI_DEVICE_ID_LMC_T1 0x0006
@@ -1076,7 +1077,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
#define PCI_VENDOR_ID_APPLICOM 0x1389
#define PCI_DEVICE_ID_APPLICOM_PCIGENERIC 0x0001
-@@ -2035,9 +1672,6 @@
+@@ -2036,9 +1673,6 @@
#define PCI_DEVICE_ID_MOXA_CP134U 0x1340
#define PCI_DEVICE_ID_MOXA_C168 0x1680
#define PCI_DEVICE_ID_MOXA_CP168U 0x1681
@@ -1086,7 +1087,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
#define PCI_VENDOR_ID_CCD 0x1397
#define PCI_DEVICE_ID_CCD_2BD0 0x2bd0
-@@ -2058,9 +1692,7 @@
+@@ -2059,9 +1693,7 @@
#define PCI_VENDOR_ID_MICROGATE 0x13c0
#define PCI_DEVICE_ID_MICROGATE_USC 0x0010
@@ -1096,7 +1097,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
#define PCI_VENDOR_ID_3WARE 0x13C1
#define PCI_DEVICE_ID_3WARE_1000 0x1000
-@@ -2111,10 +1743,6 @@
+@@ -2112,10 +1744,6 @@
#define PCI_VENDOR_ID_SAMSUNG 0x144d
@@ -1107,7 +1108,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
#define PCI_VENDOR_ID_TITAN 0x14D2
#define PCI_DEVICE_ID_TITAN_010L 0x8001
-@@ -2133,8 +1761,6 @@
+@@ -2134,8 +1762,6 @@
#define PCI_DEVICE_ID_PANACOM_QUADMODEM 0x0400
#define PCI_DEVICE_ID_PANACOM_DUALMODEM 0x0402
@@ -1116,7 +1117,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
#define PCI_VENDOR_ID_AFAVLAB 0x14db
#define PCI_DEVICE_ID_AFAVLAB_P028 0x2180
-@@ -2199,8 +1825,6 @@
+@@ -2200,8 +1826,6 @@
#define PCI_VENDOR_ID_CHELSIO 0x1425
@@ -1125,7 +1126,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
#define PCI_VENDOR_ID_SYBA 0x1592
#define PCI_DEVICE_ID_SYBA_2P_EPP 0x0782
-@@ -2220,15 +1844,7 @@
+@@ -2221,15 +1845,7 @@
#define PCI_DEVICE_ID_MELLANOX_SINAI 0x6274
#define PCI_VENDOR_ID_PDC 0x15e9
@@ -1141,7 +1142,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
#define PCI_VENDOR_ID_FARSITE 0x1619
#define PCI_DEVICE_ID_FARSITE_T2P 0x0400
-@@ -2246,7 +1862,6 @@
+@@ -2247,7 +1863,6 @@
#define PCI_DEVICE_ID_REVOLUTION 0x0044
#define PCI_VENDOR_ID_LINKSYS 0x1737
@@ -1149,7 +1150,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
#define PCI_DEVICE_ID_LINKSYS_EG1064 0x1064
#define PCI_VENDOR_ID_ALTIMA 0x173b
-@@ -2261,7 +1876,6 @@
+@@ -2262,7 +1877,6 @@
#define PCI_DEVICE_ID_HERC_WIN 0x5732
#define PCI_DEVICE_ID_HERC_UNI 0x5832
@@ -1157,7 +1158,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
#define PCI_VENDOR_ID_SITECOM 0x182d
#define PCI_DEVICE_ID_SITECOM_DC105V2 0x3069
-@@ -2271,8 +1885,6 @@
+@@ -2272,8 +1886,6 @@
#define PCI_VENDOR_ID_TDI 0x192E
#define PCI_DEVICE_ID_TDI_EHCI 0x0101
@@ -1166,7 +1167,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
#define PCI_VENDOR_ID_TEKRAM 0x1de1
#define PCI_DEVICE_ID_TEKRAM_DC290 0xdc29
-@@ -2281,59 +1893,26 @@
+@@ -2282,59 +1894,26 @@
#define PCI_DEVICE_ID_HINT_VXPROII_IDE 0x8013
#define PCI_VENDOR_ID_3DLABS 0x3d3d
@@ -1226,7 +1227,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
#define PCI_VENDOR_ID_DCI 0x6666
#define PCI_DEVICE_ID_DCI_PCCOM4 0x0001
-@@ -2341,7 +1920,6 @@
+@@ -2342,7 +1921,6 @@
#define PCI_VENDOR_ID_INTEL 0x8086
#define PCI_DEVICE_ID_INTEL_EESSC 0x0008
@@ -1234,7 +1235,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
#define PCI_DEVICE_ID_INTEL_PXHD_0 0x0320
#define PCI_DEVICE_ID_INTEL_PXHD_1 0x0321
#define PCI_DEVICE_ID_INTEL_PXH_0 0x0329
-@@ -2350,30 +1928,17 @@
+@@ -2351,30 +1929,17 @@
#define PCI_DEVICE_ID_INTEL_82375 0x0482
#define PCI_DEVICE_ID_INTEL_82424 0x0483
#define PCI_DEVICE_ID_INTEL_82378 0x0484
@@ -1265,7 +1266,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
#define PCI_DEVICE_ID_INTEL_82441 0x1237
#define PCI_DEVICE_ID_INTEL_82380FB 0x124b
#define PCI_DEVICE_ID_INTEL_82439 0x1250
-@@ -2382,83 +1947,53 @@
+@@ -2383,83 +1948,53 @@
#define PCI_DEVICE_ID_INTEL_82845_HB 0x1a30
#define PCI_DEVICE_ID_INTEL_82801AA_0 0x2410
#define PCI_DEVICE_ID_INTEL_82801AA_1 0x2411
@@ -1349,7 +1350,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
#define PCI_DEVICE_ID_INTEL_82820_HB 0x2500
#define PCI_DEVICE_ID_INTEL_82820_UP_HB 0x2501
#define PCI_DEVICE_ID_INTEL_82850_HB 0x2530
-@@ -2468,7 +2003,6 @@
+@@ -2469,7 +2004,6 @@
#define PCI_DEVICE_ID_INTEL_82865_HB 0x2570
#define PCI_DEVICE_ID_INTEL_82865_IG 0x2572
#define PCI_DEVICE_ID_INTEL_82875_HB 0x2578
@@ -1357,7 +1358,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
#define PCI_DEVICE_ID_INTEL_82915G_HB 0x2580
#define PCI_DEVICE_ID_INTEL_82915G_IG 0x2582
#define PCI_DEVICE_ID_INTEL_82915GM_HB 0x2590
-@@ -2478,80 +2012,23 @@
+@@ -2479,80 +2013,23 @@
#define PCI_DEVICE_ID_INTEL_ICH6_0 0x2640
#define PCI_DEVICE_ID_INTEL_ICH6_1 0x2641
#define PCI_DEVICE_ID_INTEL_ICH6_2 0x2642
@@ -1438,7 +1439,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
#define PCI_DEVICE_ID_INTEL_82830_HB 0x3575
#define PCI_DEVICE_ID_INTEL_82830_CGC 0x3577
#define PCI_DEVICE_ID_INTEL_82855GM_HB 0x3580
-@@ -2565,7 +2042,6 @@
+@@ -2566,7 +2043,6 @@
#define PCI_DEVICE_ID_INTEL_MCH_PC 0x3599
#define PCI_DEVICE_ID_INTEL_MCH_PC1 0x359a
#define PCI_DEVICE_ID_INTEL_E7525_MCH 0x359e
@@ -1446,7 +1447,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
#define PCI_DEVICE_ID_INTEL_82371SB_0 0x7000
#define PCI_DEVICE_ID_INTEL_82371SB_1 0x7010
#define PCI_DEVICE_ID_INTEL_82371SB_2 0x7020
-@@ -2590,22 +2066,15 @@
+@@ -2591,22 +2067,15 @@
#define PCI_DEVICE_ID_INTEL_440MX_6 0x7196
#define PCI_DEVICE_ID_INTEL_82443MX_0 0x7198
#define PCI_DEVICE_ID_INTEL_82443MX_1 0x7199
@@ -1469,7 +1470,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
#define PCI_DEVICE_ID_INTEL_IXP2800 0x9004
#define PCI_DEVICE_ID_INTEL_S21152BB 0xb152
-@@ -2618,7 +2087,6 @@
+@@ -2619,7 +2088,6 @@
#define PCI_SUBDEVICE_ID_COMPUTONE_PG6 0x0003
#define PCI_VENDOR_ID_KTI 0x8e2e
@@ -1477,7 +1478,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
#define PCI_VENDOR_ID_ADAPTEC 0x9004
#define PCI_DEVICE_ID_ADAPTEC_7810 0x1078
-@@ -2626,7 +2094,6 @@
+@@ -2627,7 +2095,6 @@
#define PCI_DEVICE_ID_ADAPTEC_38602 0x3860
#define PCI_DEVICE_ID_ADAPTEC_7850 0x5078
#define PCI_DEVICE_ID_ADAPTEC_7855 0x5578
@@ -1485,7 +1486,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
#define PCI_DEVICE_ID_ADAPTEC_3860 0x6038
#define PCI_DEVICE_ID_ADAPTEC_1480A 0x6075
#define PCI_DEVICE_ID_ADAPTEC_7860 0x6078
-@@ -2646,7 +2113,6 @@
+@@ -2647,7 +2114,6 @@
#define PCI_DEVICE_ID_ADAPTEC_7886 0x8678
#define PCI_DEVICE_ID_ADAPTEC_7887 0x8778
#define PCI_DEVICE_ID_ADAPTEC_7888 0x8878
@@ -1493,7 +1494,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
#define PCI_VENDOR_ID_ADAPTEC2 0x9005
#define PCI_DEVICE_ID_ADAPTEC2_2940U2 0x0010
-@@ -2666,8 +2132,6 @@
+@@ -2667,8 +2133,6 @@
#define PCI_DEVICE_ID_ADAPTEC2_7899P 0x00cf
#define PCI_DEVICE_ID_ADAPTEC2_SCAMP 0x0503
@@ -1502,7 +1503,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
#define PCI_VENDOR_ID_HOLTEK 0x9412
#define PCI_DEVICE_ID_HOLTEK_6565 0x6565
-@@ -2699,7 +2163,3 @@
+@@ -2701,7 +2165,3 @@
#define PCI_DEVICE_ID_RME_DIGI32_PRO 0x9897
#define PCI_DEVICE_ID_RME_DIGI32_8 0x9898
diff --git a/pci/pci-quirk-hpd530.patch b/pci/pci-quirk-hpd530.patch
index a785a7aebc5952..9750d4efee344d 100644
--- a/pci/pci-quirk-hpd530.patch
+++ b/pci/pci-quirk-hpd530.patch
@@ -18,7 +18,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
--- gregkh-2.6.orig/drivers/pci/quirks.c
+++ gregkh-2.6/drivers/pci/quirks.c
-@@ -875,6 +875,7 @@ static void __init asus_hides_smbus_host
+@@ -950,6 +950,7 @@ static void __init asus_hides_smbus_host
if (dev->device == PCI_DEVICE_ID_INTEL_82865_HB)
switch (dev->subsystem_device) {
case 0x12bc: /* HP D330L */
diff --git a/pci/pci_ids-cleanup-comments.patch b/pci/pci_ids-cleanup-comments.patch
index d1b70bd3309125..b7e74dfbef97ff 100644
--- a/pci/pci_ids-cleanup-comments.patch
+++ b/pci/pci_ids-cleanup-comments.patch
@@ -29,7 +29,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
#define PCI_DEVICE_ID_COMPEX2_100VG 0x0005
#define PCI_VENDOR_ID_WD 0x101c
-@@ -1157,10 +1157,10 @@
+@@ -1158,10 +1158,10 @@
#define PCI_VENDOR_ID_INIT 0x1101
@@ -42,7 +42,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
#define PCI_DEVICE_ID_ECTIVA_EV1938 0x8938
#define PCI_VENDOR_ID_TTI 0x1103
-@@ -1170,7 +1170,7 @@
+@@ -1171,7 +1171,7 @@
#define PCI_DEVICE_ID_TTI_HPT302 0x0006
#define PCI_DEVICE_ID_TTI_HPT371 0x0007
#define PCI_DEVICE_ID_TTI_HPT374 0x0008
diff --git a/series b/series
index c7f156adc39de6..375403f1b8b97b 100644
--- a/series
+++ b/series
@@ -141,6 +141,21 @@ i2c/kzalloc-03-i2c-other.patch
i2c/kzalloc-04-drop-useless-casts.patch
i2c/kzalloc-05-i2c-amd756-s4882.patch
i2c/kzalloc-06-i2c-documentation-update.patch
+i2c/static-01-i2c-eeprom.patch
+i2c/static-02-hwmon-lm78-lm85.patch
+i2c/static-03-hwmon-other.patch
+i2c/static-04-i2c-chips-other.patch
+i2c/i2c-id-clean-redefinitions-1.patch
+i2c/i2c-drop-unused-parport-i2c-ids.patch
+i2c/i2c-i810-update-device-list.patch
+i2c/i2c-smbus-pec-01-drop-pec-funcs.patch
+i2c/i2c-smbus-pec-02-swpec-rewrite.patch
+i2c/i2c-smbus-pec-03-drop-swpec-sizes.patch
+i2c/i2c-i801-simplify-hwpec-tests.patch
+i2c/hwmon-lm90-01-separate-read-reg.patch
+i2c/hwmon-lm90-02-add-pec-adm1032.patch
+i2c/hwmon-lm90-03-new-addresses.patch
+i2c/hwmon-smsc47m1-mention-47m997.patch
# still needs a lot of work before acceptance
i2c/i2c-device-id.patch
@@ -277,6 +292,8 @@ usb/usb-fix-maxpacket-length-for-ep0-on-root-hubs.patch
usb/usbcore-fix-handling-of-sysfs-strings-and-other-attributes.patch
usb/usb-fix-pm-patches-with-config_pm-off-part-1.patch
usb/usb-fix-pm-patches-with-config_pm-off-part-2.patch
+usb/usb-fix-correct-wording-in-drivers-usb-net-kconfig.patch
+usb/usb-add-new-device-id-to-ftdi_sio-module.patch
# my ols tutorial driver
usb/usb-gotemp.patch
@@ -307,22 +324,4 @@ devfs/devfs-minor-cleanups.patch
# what a load of crap...
devfs/ndevfs.patch
-i2c/static-01-i2c-eeprom.patch
-i2c/static-02-hwmon-lm78-lm85.patch
-i2c/static-03-hwmon-other.patch
-i2c/static-04-i2c-chips-other.patch
-i2c/i2c-id-clean-redefinitions-1.patch
-i2c/i2c-drop-unused-parport-i2c-ids.patch
-i2c/i2c-i810-update-device-list.patch
-i2c/i2c-smbus-pec-01-drop-pec-funcs.patch
-i2c/i2c-smbus-pec-02-swpec-rewrite.patch
-i2c/i2c-smbus-pec-03-drop-swpec-sizes.patch
-i2c/i2c-i801-simplify-hwpec-tests.patch
-i2c/hwmon-lm90-01-separate-read-reg.patch
-i2c/hwmon-lm90-02-add-pec-adm1032.patch
-i2c/hwmon-lm90-03-new-addresses.patch
-i2c/hwmon-smsc47m1-mention-47m997.patch
-
-usb/usb-fix-correct-wording-in-drivers-usb-net-kconfig.patch
-usb/usb-add-new-device-id-to-ftdi_sio-module.patch
diff --git a/usb/usb-always-do-usb-handoff.patch b/usb/usb-always-do-usb-handoff.patch
index ccb9807fa6d59e..51e6f089a59a64 100644
--- a/usb/usb-always-do-usb-handoff.patch
+++ b/usb/usb-always-do-usb-handoff.patch
@@ -25,7 +25,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
--- gregkh-2.6.orig/Documentation/kernel-parameters.txt
+++ gregkh-2.6/Documentation/kernel-parameters.txt
-@@ -1498,8 +1498,6 @@ running once the system is up.
+@@ -1517,8 +1517,6 @@ running once the system is up.
uart6850= [HW,OSS]
Format: <io>,<irq>
@@ -33,7 +33,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-
usbhid.mousepoll=
[USBHID] The interval which mice are to be polled at.
-
+
--- gregkh-2.6.orig/drivers/usb/host/pci-quirks.c
+++ gregkh-2.6/drivers/usb/host/pci-quirks.c
@@ -23,33 +23,6 @@
diff --git a/usb/usb-handoff-merge.patch b/usb/usb-handoff-merge.patch
index 2db8c410dcba78..7bbbdaff47a753 100644
--- a/usb/usb-handoff-merge.patch
+++ b/usb/usb-handoff-merge.patch
@@ -348,7 +348,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* The bridge optimization stuff has been removed. If you really
* have a silly BIOS which is unable to set your host bridge right,
* use the PowerTweak utility (see http://powertweak.sourceforge.net).
-@@ -570,28 +573,6 @@ static void quirk_via_irq(struct pci_dev
+@@ -645,28 +648,6 @@ static void quirk_via_irq(struct pci_dev
DECLARE_PCI_FIXUP_ENABLE(PCI_VENDOR_ID_VIA, PCI_ANY_ID, quirk_via_irq);
/*
@@ -377,7 +377,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* VIA VT82C598 has its device ID settable and many BIOSes
* set it to the ID of VT82C597 for backward compatibility.
* We need to switch it off to be able to recognize the real
-@@ -964,234 +945,6 @@ static void __init quirk_sis_96x_smbus(s
+@@ -1039,234 +1020,6 @@ static void __init quirk_sis_96x_smbus(s
pci_read_config_byte(dev, 0x77, &val);
}
diff --git a/usb/usb-use-notifier-inode.patch b/usb/usb-use-notifier-inode.patch
index 381002beaf88d1..768d3c03abf515 100644
--- a/usb/usb-use-notifier-inode.patch
+++ b/usb/usb-use-notifier-inode.patch
@@ -13,7 +13,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
--- gregkh-2.6.orig/drivers/usb/core/hcd.h
+++ gregkh-2.6/drivers/usb/core/hcd.h
-@@ -390,23 +390,13 @@ extern int hcd_bus_resume (struct usb_bu
+@@ -400,23 +400,13 @@ static inline int hcd_bus_resume (struct
* these are expected to be called from the USB core/hub thread
* with the kernel lock held
*/
diff --git a/usb/usb-use-notifier-usbmon.patch b/usb/usb-use-notifier-usbmon.patch
index 8f6f259b20f050..ae268d8ff3a6f5 100644
--- a/usb/usb-use-notifier-usbmon.patch
+++ b/usb/usb-use-notifier-usbmon.patch
@@ -73,7 +73,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
down(&mon_lock);
--- gregkh-2.6.orig/drivers/usb/core/hcd.h
+++ gregkh-2.6/drivers/usb/core/hcd.h
-@@ -411,8 +411,6 @@ struct usb_mon_operations {
+@@ -421,8 +421,6 @@ struct usb_mon_operations {
void (*urb_submit_error)(struct usb_bus *bus, struct urb *urb, int err);
void (*urb_complete)(struct usb_bus *bus, struct urb *urb);
/* void (*urb_unlink)(struct usb_bus *bus, struct urb *urb); */
@@ -82,7 +82,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
};
extern struct usb_mon_operations *mon_ops;
-@@ -435,18 +433,6 @@ static inline void usbmon_urb_complete(s
+@@ -445,18 +443,6 @@ static inline void usbmon_urb_complete(s
if (bus->monitored)
(*mon_ops->urb_complete)(bus, urb);
}
@@ -101,7 +101,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
int usb_mon_register(struct usb_mon_operations *ops);
void usb_mon_deregister(void);
-@@ -457,8 +443,6 @@ static inline void usbmon_urb_submit(str
+@@ -467,8 +453,6 @@ static inline void usbmon_urb_submit(str
static inline void usbmon_urb_submit_error(struct usb_bus *bus, struct urb *urb,
int error) {}
static inline void usbmon_urb_complete(struct usb_bus *bus, struct urb *urb) {}
generated by cgit 1.2.3-korg (git 2.39.0) at 2024-05-18 01:19:58 +0000