powerpc/iseries: Convert to proc_fops

[safe/jmp/linux-2.6] / include / linux / acpi.h

diff --git a/include/linux/acpi.h b/include/linux/acpi.h
index 535beec..ce945d4 100644 (file)
--- a/include/linux/acpi.h
+++ b/include/linux/acpi.h
@@ -240,7 +240,7 @@ extern int pnpacpi_disabled;
 #define PXM_INVAL      (-1)
 #define NID_INVAL      (-1)
 
-int acpi_check_resource_conflict(struct resource *res);
+int acpi_check_resource_conflict(const struct resource *res);
 
 int acpi_check_region(resource_size_t start, resource_size_t n,
                      const char *name);
@@ -273,6 +273,13 @@ struct acpi_osc_context {
 
 acpi_status acpi_run_osc(acpi_handle handle, struct acpi_osc_context *context);
 
+/* platform-wide _OSC bits */
+#define OSC_SB_PAD_SUPPORT             1
+#define OSC_SB_PPC_OST_SUPPORT         2
+#define OSC_SB_PR3_SUPPORT             4
+#define OSC_SB_CPUHP_OST_SUPPORT       8
+#define OSC_SB_APEI_SUPPORT            16
+
 /* PCI defined _OSC bits */
 /* _OSC DW1 Definition (OS Support Fields) */
 #define OSC_EXT_PCI_CONFIG_SUPPORT             1