diff options
| author | Len Brown <len.brown@intel.com> | 2004-07-30 17:47:15 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2004-07-30 17:47:15 -0400 |
| commit | 2c5a5b2c33d063afc796cf6572037bfd1410e3ab (patch) | |
| tree | 80835cc4d85f77aa03ee9403142dde0942f7d035 /include | |
| parent | fadf2a9e716db75c78aaa2c974c7335959e8868d (diff) | |
| parent | 6e0418be96dba0e878c1a7ba3c184a4d4c296edd (diff) | |
| download | history-2c5a5b2c33d063afc796cf6572037bfd1410e3ab.tar.gz | |
Merge intel.com:/home/lenb/bk/linux-2.6.8
into intel.com:/home/lenb/src/linux-acpi-test-2.6.8
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-sparc/openpromio.h | 5 | ||||
| -rw-r--r-- | include/asm-sparc64/openpromio.h | 1 | ||||
| -rw-r--r-- | include/linux/pci_ids.h | 9 |
3 files changed, 11 insertions, 4 deletions
diff --git a/include/asm-sparc/openpromio.h b/include/asm-sparc/openpromio.h index 6e32823ab4e275..917fb8e9c63382 100644 --- a/include/asm-sparc/openpromio.h +++ b/include/asm-sparc/openpromio.h @@ -1,6 +1,7 @@ #ifndef _SPARC_OPENPROMIO_H #define _SPARC_OPENPROMIO_H +#include <linux/compiler.h> #include <linux/ioctl.h> #include <linux/types.h> @@ -52,9 +53,9 @@ struct opiocdesc { int op_nodeid; /* PROM Node ID (value-result) */ int op_namelen; /* Length of op_name. */ - char *op_name; /* Pointer to the property name. */ + char __user *op_name; /* Pointer to the property name. */ int op_buflen; /* Length of op_buf (value-result) */ - char *op_buf; /* Pointer to buffer. */ + char __user *op_buf; /* Pointer to buffer. */ }; #define OPIOCGET _IOWR('O', 1, struct opiocdesc) diff --git a/include/asm-sparc64/openpromio.h b/include/asm-sparc64/openpromio.h index a5b88e9d99877c..847ce2326ad5fb 100644 --- a/include/asm-sparc64/openpromio.h +++ b/include/asm-sparc64/openpromio.h @@ -1,6 +1,7 @@ #ifndef _SPARC64_OPENPROMIO_H #define _SPARC64_OPENPROMIO_H +#include <linux/compiler.h> #include <linux/ioctl.h> #include <linux/types.h> diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index 6544a8c57b66f7..237a53e2224f37 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h @@ -1188,7 +1188,9 @@ #define PCI_VENDOR_ID_VIA 0x1106 #define PCI_DEVICE_ID_VIA_8763_0 0x0198 #define PCI_DEVICE_ID_VIA_8380_0 0x0204 +#define PCI_DEVICE_ID_VIA_3238_0 0x0238 #define PCI_DEVICE_ID_VIA_PX8X0_0 0x0259 +#define PCI_DEVICE_ID_VIA_3269_0 0x0269 #define PCI_DEVICE_ID_VIA_K8T800PRO_0 0x0282 #define PCI_DEVICE_ID_VIA_8363_0 0x0305 #define PCI_DEVICE_ID_VIA_8371_0 0x0391 @@ -1225,9 +1227,9 @@ #define PCI_DEVICE_ID_VIA_82C686_6 0x3068 #define PCI_DEVICE_ID_VIA_8233_0 0x3074 #define PCI_DEVICE_ID_VIA_8633_0 0x3091 -#define PCI_DEVICE_ID_VIA_8367_0 0x3099 +#define PCI_DEVICE_ID_VIA_8367_0 0x3099 #define PCI_DEVICE_ID_VIA_8653_0 0x3101 -#define PCI_DEVICE_ID_VIA_8622 0x3102 +#define PCI_DEVICE_ID_VIA_8622 0x3102 #define PCI_DEVICE_ID_VIA_8233C_0 0x3109 #define PCI_DEVICE_ID_VIA_8361 0x3112 #define PCI_DEVICE_ID_VIA_XM266 0x3116 @@ -1247,6 +1249,7 @@ #define PCI_DEVICE_ID_VIA_PT880 0x3258 #define PCI_DEVICE_ID_VIA_P4M400 0x3209 #define PCI_DEVICE_ID_VIA_8237 0x3227 +#define PCI_DEVICE_ID_VIA_3296_0 0x0296 #define PCI_DEVICE_ID_VIA_86C100A 0x6100 #define PCI_DEVICE_ID_VIA_8231 0x8231 #define PCI_DEVICE_ID_VIA_8231_4 0x8235 @@ -2158,6 +2161,8 @@ #define PCI_DEVICE_ID_INTEL_82865_IG 0x2572 #define PCI_DEVICE_ID_INTEL_82875_HB 0x2578 #define PCI_DEVICE_ID_INTEL_82875_IG 0x257b +#define PCI_DEVICE_ID_INTEL_82915G_HB 0x2580 +#define PCI_DEVICE_ID_INTEL_82915G_IG 0x2582 #define PCI_DEVICE_ID_INTEL_ICH6_0 0x2640 #define PCI_DEVICE_ID_INTEL_ICH6_1 0x2641 #define PCI_DEVICE_ID_INTEL_ICH6_2 0x2642 |