diff options
| author | Len Brown <len.brown@intel.com> | 2008-10-22 23:28:36 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2008-10-22 23:28:36 -0400 |
| commit | 530bc23bfeaa9156003afbeb9708fd03a5f1c73c (patch) | |
| tree | 19f9a50f337fe3ee2d57a63ca6d7739a2fdbc3d2 /include | |
| parent | ead90393438e0100763c6afd58eaae6a8418c6df (diff) | |
| parent | 27471fdb32e77ecb92f09d4ac5757785b4dc33bc (diff) | |
Merge branch 'i7300_idle' into test
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-x86/idle.h | 1 | ||||
| -rw-r--r-- | include/linux/pci_ids.h | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/include/asm-x86/idle.h b/include/asm-x86/idle.h index cbb649123612..54ce018d4b6c 100644 --- a/include/asm-x86/idle.h +++ b/include/asm-x86/idle.h | |||
| @@ -6,6 +6,7 @@ | |||
| 6 | 6 | ||
| 7 | struct notifier_block; | 7 | struct notifier_block; |
| 8 | void idle_notifier_register(struct notifier_block *n); | 8 | void idle_notifier_register(struct notifier_block *n); |
| 9 | void idle_notifier_unregister(struct notifier_block *n); | ||
| 9 | 10 | ||
| 10 | void enter_idle(void); | 11 | void enter_idle(void); |
| 11 | void exit_idle(void); | 12 | void exit_idle(void); |
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index f1624b396754..efb786d11f2a 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h | |||
| @@ -2422,6 +2422,7 @@ | |||
| 2422 | #define PCI_DEVICE_ID_INTEL_MCH_PC1 0x359a | 2422 | #define PCI_DEVICE_ID_INTEL_MCH_PC1 0x359a |
| 2423 | #define PCI_DEVICE_ID_INTEL_E7525_MCH 0x359e | 2423 | #define PCI_DEVICE_ID_INTEL_E7525_MCH 0x359e |
| 2424 | #define PCI_DEVICE_ID_INTEL_IOAT_CNB 0x360b | 2424 | #define PCI_DEVICE_ID_INTEL_IOAT_CNB 0x360b |
| 2425 | #define PCI_DEVICE_ID_INTEL_FBD_CNB 0x360c | ||
| 2425 | #define PCI_DEVICE_ID_INTEL_ICH10_0 0x3a14 | 2426 | #define PCI_DEVICE_ID_INTEL_ICH10_0 0x3a14 |
| 2426 | #define PCI_DEVICE_ID_INTEL_ICH10_1 0x3a16 | 2427 | #define PCI_DEVICE_ID_INTEL_ICH10_1 0x3a16 |
| 2427 | #define PCI_DEVICE_ID_INTEL_ICH10_2 0x3a18 | 2428 | #define PCI_DEVICE_ID_INTEL_ICH10_2 0x3a18 |