summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-01-31 16:20:55 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2006-01-31 16:20:55 -0800
commit10379a25fee8ddc8698d2f6c54ccedd4664c2941 (patch)
treefba7fe3a1aa8e85104f9dcf08ff217dd4b0160c4 /include
parent63b3ced0f80ae1c437620d3f7d6ff2bcf0745b0a (diff)
parent3b0e8eadc511eaceba6d6b8d0743359a34ee23c6 (diff)
downloadop-kernel-dev-10379a25fee8ddc8698d2f6c54ccedd4664c2941.zip
op-kernel-dev-10379a25fee8ddc8698d2f6c54ccedd4664c2941.tar.gz
Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart
Diffstat (limited to 'include')
-rw-r--r--include/linux/agpgart.h3
-rw-r--r--include/linux/pci_ids.h2
2 files changed, 4 insertions, 1 deletions
diff --git a/include/linux/agpgart.h b/include/linux/agpgart.h
index 17a17c5..6d59c8e 100644
--- a/include/linux/agpgart.h
+++ b/include/linux/agpgart.h
@@ -111,6 +111,7 @@ typedef struct _agp_unbind {
} agp_unbind;
#else /* __KERNEL__ */
+#include <linux/mutex.h>
#define AGPGART_MINOR 175
@@ -201,7 +202,7 @@ struct agp_file_private {
};
struct agp_front_data {
- struct semaphore agp_mutex;
+ struct mutex agp_mutex;
struct agp_controller *current_controller;
struct agp_controller *controllers;
struct agp_file_private *file_priv_list;
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index ecc1fc1..4401a7e 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -2085,6 +2085,8 @@
#define PCI_DEVICE_ID_INTEL_82915GM_IG 0x2592
#define PCI_DEVICE_ID_INTEL_82945G_HB 0x2770
#define PCI_DEVICE_ID_INTEL_82945G_IG 0x2772
+#define PCI_DEVICE_ID_INTEL_82945GM_HB 0x27A0
+#define PCI_DEVICE_ID_INTEL_82945GM_IG 0x27A2
#define PCI_DEVICE_ID_INTEL_ICH6_0 0x2640
#define PCI_DEVICE_ID_INTEL_ICH6_1 0x2641
#define PCI_DEVICE_ID_INTEL_ICH6_2 0x2642
OpenPOWER on IntegriCloud