diff options
| author | Len Brown <len.brown@intel.com> | 2009-01-09 03:41:08 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2009-01-09 03:41:08 -0500 |
| commit | ec9f168fcc344d2ffec1c8c822076bf22dab5c33 (patch) | |
| tree | c7978abf4bba0a2718cd0f9c0c0efe93d734d226 /include/acpi | |
| parent | b2576e1d4408e134e2188c967b1f28af39cd79d4 (diff) | |
| parent | 087da3b4e2d7d3ef70a4fa649b9a286fdeb0e44e (diff) | |
Merge branch 'simplify_PRT' into release
Conflicts:
drivers/acpi/pci_irq.c
Note that this merge disables
e1d3a90846b40ad3160bf4b648d36c6badad39ac
pci, acpi: reroute PCI interrupt to legacy boot interrupt equivalent
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'include/acpi')
| -rw-r--r-- | include/acpi/platform/aclinux.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/include/acpi/platform/aclinux.h b/include/acpi/platform/aclinux.h index 3cabf888c8af..6d49b2a498c4 100644 --- a/include/acpi/platform/aclinux.h +++ b/include/acpi/platform/aclinux.h | |||
| @@ -71,9 +71,6 @@ | |||
| 71 | #define ACPI_EXPORT_SYMBOL(symbol) EXPORT_SYMBOL(symbol); | 71 | #define ACPI_EXPORT_SYMBOL(symbol) EXPORT_SYMBOL(symbol); |
| 72 | #define strtoul simple_strtoul | 72 | #define strtoul simple_strtoul |
| 73 | 73 | ||
| 74 | /* Full namespace pathname length limit - arbitrary */ | ||
| 75 | #define ACPI_PATHNAME_MAX 256 | ||
| 76 | |||
| 77 | #else /* !__KERNEL__ */ | 74 | #else /* !__KERNEL__ */ |
| 78 | 75 | ||
| 79 | #include <stdarg.h> | 76 | #include <stdarg.h> |