git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
drivers
/
pci
/
hotplug
/
acpiphp.h
diff --git
a/drivers/pci/hotplug/acpiphp.h
b/drivers/pci/hotplug/acpiphp.h
index
be104ec
..
ddbadd9
100644
(file)
--- a/
drivers/pci/hotplug/acpiphp.h
+++ b/
drivers/pci/hotplug/acpiphp.h
@@
-38,7
+38,7
@@
#include <linux/acpi.h>
#include <linux/kobject.h> /* for KOBJ_NAME_LEN */
#include <linux/mutex.h>
#include <linux/acpi.h>
#include <linux/kobject.h> /* for KOBJ_NAME_LEN */
#include <linux/mutex.h>
-#include
"pci_hotplug.h"
+#include
<linux/pci_hotplug.h>
#define dbg(format, arg...) \
do { \
#define dbg(format, arg...) \
do { \
@@
-62,10
+62,10
@@
struct acpiphp_slot;
struct slot {
struct hotplug_slot *hotplug_slot;
struct acpiphp_slot *acpi_slot;
struct slot {
struct hotplug_slot *hotplug_slot;
struct acpiphp_slot *acpi_slot;
+ struct hotplug_slot_info info;
+ char name[SLOT_NAME_SIZE];
};
};
-
-
/**
* struct acpiphp_bridge - PCI bridge information
*
/**
* struct acpiphp_bridge - PCI bridge information
*
@@
-150,6
+150,11
@@
struct acpiphp_attention_info
struct module *owner;
};
struct module *owner;
};
+struct acpiphp_ioapic {
+ struct pci_dev *dev;
+ u32 gsi_base;
+ struct list_head list;
+};
/* PCI bus bridge HID */
#define ACPI_PCI_HOST_HID "PNP0A03"
/* PCI bus bridge HID */
#define ACPI_PCI_HOST_HID "PNP0A03"