diff options
| author | Paul Mackerras <paulus@samba.org> | 2002-12-18 12:59:00 +1100 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2002-12-18 12:59:00 +1100 |
| commit | 538e34916631e942829b6edabac4099190ae9b71 (patch) | |
| tree | a95aa0ab70470ee7595bc5dfafcc7316d01467fd /include/linux | |
| parent | a6796760e38fdb8c375c18ebf718118496157ff2 (diff) | |
| parent | 4749dedc684b1a8f6c9f31b85b1f6d1a63ca495a (diff) | |
Merge samba.org:/home/paulus/kernel/linux-2.5
into samba.org:/home/paulus/kernel/for-linus-ppc
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/agp_backend.h | 1 | ||||
| -rw-r--r-- | include/linux/device-mapper.h | 9 | ||||
| -rw-r--r-- | include/linux/dm-ioctl.h | 6 | ||||
| -rw-r--r-- | include/linux/pci_ids.h | 3 |
4 files changed, 9 insertions, 10 deletions
diff --git a/include/linux/agp_backend.h b/include/linux/agp_backend.h index fe59e8cf0378..e6fa886e8d82 100644 --- a/include/linux/agp_backend.h +++ b/include/linux/agp_backend.h @@ -51,6 +51,7 @@ enum chipset_type { INTEL_I850, INTEL_I860, INTEL_460GX, + INTEL_I7505, VIA_GENERIC, VIA_VP3, VIA_MVP3, diff --git a/include/linux/device-mapper.h b/include/linux/device-mapper.h index bf9b15f5f70b..7dc8a14b8396 100644 --- a/include/linux/device-mapper.h +++ b/include/linux/device-mapper.h @@ -7,13 +7,6 @@ #ifndef _LINUX_DEVICE_MAPPER_H #define _LINUX_DEVICE_MAPPER_H -#define DM_DIR "mapper" /* Slashes not supported */ -#define DM_MAX_TYPE_NAME 16 -#define DM_NAME_LEN 128 -#define DM_UUID_LEN 129 - -#ifdef __KERNEL__ - struct dm_target; struct dm_table; struct dm_dev; @@ -101,6 +94,4 @@ struct dm_target { int dm_register_target(struct target_type *t); int dm_unregister_target(struct target_type *t); -#endif /* __KERNEL__ */ - #endif /* _LINUX_DEVICE_MAPPER_H */ diff --git a/include/linux/dm-ioctl.h b/include/linux/dm-ioctl.h index c5ae8cd3921c..72edd5e19e62 100644 --- a/include/linux/dm-ioctl.h +++ b/include/linux/dm-ioctl.h @@ -7,9 +7,13 @@ #ifndef _LINUX_DM_IOCTL_H #define _LINUX_DM_IOCTL_H -#include <linux/device-mapper.h> #include <linux/types.h> +#define DM_DIR "mapper" /* Slashes not supported */ +#define DM_MAX_TYPE_NAME 16 +#define DM_NAME_LEN 128 +#define DM_UUID_LEN 129 + /* * Implements a traditional ioctl interface to the device mapper. */ diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index 7c0e1de47668..4f90ff1ccbe8 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h @@ -1727,6 +1727,9 @@ #define PCI_DEVICE_ID_INTEL_82092AA_0 0x1221 #define PCI_DEVICE_ID_INTEL_82092AA_1 0x1222 #define PCI_DEVICE_ID_INTEL_7116 0x1223 +#define PCI_DEVICE_ID_INTEL_7505_0 0x2550 +#define PCI_DEVICE_ID_INTEL_7505_1 0x2552 +#define PCI_DEVICE_ID_INTEL_7205_0 0x255d #define PCI_DEVICE_ID_INTEL_82596 0x1226 #define PCI_DEVICE_ID_INTEL_82865 0x1227 #define PCI_DEVICE_ID_INTEL_82557 0x1229 |