summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-08-03 17:31:15 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-08-03 17:31:15 -0700
commit6e315544a61ac0fa21369e54e50a947ab899966e (patch)
treef21f3c381fe3202a85828cd3020a48847aeafb05 /include
parentc31ca59e25f82879644088c97fe9cffbaa292786 (diff)
parent2131ca8915ae545c596f94e75b692be2811d9c03 (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/pci-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/pci-2.6: PNP: Add missing casts in printk() arguments PCI: docking station: remove dock uevents PCI: Unhide the SMBus on Asus PU-DLS PCI Hotplug: add acpiphp to MAINTAINERS PCI: pci/search: EXPORTs cannot be __devinit PCIE: cleanup on probe error pcie: fix warnings when CONFIG_PM=n
Diffstat (limited to 'include')
-rw-r--r--include/linux/kobject.h2
-rw-r--r--include/linux/pci_ids.h1
2 files changed, 1 insertions, 2 deletions
diff --git a/include/linux/kobject.h b/include/linux/kobject.h
index 0503b2ed8bae..2d229327959e 100644
--- a/include/linux/kobject.h
+++ b/include/linux/kobject.h
@@ -46,8 +46,6 @@ enum kobject_action {
KOBJ_UMOUNT = (__force kobject_action_t) 0x05, /* umount event for block devices (broken) */
KOBJ_OFFLINE = (__force kobject_action_t) 0x06, /* device offline */
KOBJ_ONLINE = (__force kobject_action_t) 0x07, /* device online */
- KOBJ_UNDOCK = (__force kobject_action_t) 0x08, /* undocking */
- KOBJ_DOCK = (__force kobject_action_t) 0x09, /* dock */
};
struct kobject {
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index c09396d2c77b..4eae06b08cf2 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -2142,6 +2142,7 @@
#define PCI_DEVICE_ID_INTEL_82820_UP_HB 0x2501
#define PCI_DEVICE_ID_INTEL_82850_HB 0x2530
#define PCI_DEVICE_ID_INTEL_82860_HB 0x2531
+#define PCI_DEVICE_ID_INTEL_E7501_MCH 0x254c
#define PCI_DEVICE_ID_INTEL_82845G_HB 0x2560
#define PCI_DEVICE_ID_INTEL_82845G_IG 0x2562
#define PCI_DEVICE_ID_INTEL_82865_HB 0x2570