diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/acpi/acpi_bus.h | 2 | ||||
-rw-r--r-- | include/asm-ia64/sn/sn_sal.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h index e496fac860ac..6dca3d542080 100644 --- a/include/acpi/acpi_bus.h +++ b/include/acpi/acpi_bus.h | |||
@@ -269,7 +269,7 @@ struct acpi_device_wakeup_state { | |||
269 | 269 | ||
270 | struct acpi_device_wakeup { | 270 | struct acpi_device_wakeup { |
271 | acpi_handle gpe_device; | 271 | acpi_handle gpe_device; |
272 | acpi_integer gpe_number;; | 272 | acpi_integer gpe_number; |
273 | acpi_integer sleep_state; | 273 | acpi_integer sleep_state; |
274 | struct acpi_handle_list resources; | 274 | struct acpi_handle_list resources; |
275 | struct acpi_device_wakeup_state state; | 275 | struct acpi_device_wakeup_state state; |
diff --git a/include/asm-ia64/sn/sn_sal.h b/include/asm-ia64/sn/sn_sal.h index e77f0c9b7d3d..b546de2fdce5 100644 --- a/include/asm-ia64/sn/sn_sal.h +++ b/include/asm-ia64/sn/sn_sal.h | |||
@@ -1037,7 +1037,7 @@ ia64_sn_get_sn_info(int fc, u8 *shubtype, u16 *nasid_bitmask, u8 *nasid_shift, | |||
1037 | 1037 | ||
1038 | /***** BEGIN HACK - temp til old proms no longer supported ********/ | 1038 | /***** BEGIN HACK - temp til old proms no longer supported ********/ |
1039 | if (ret_stuff.status == SALRET_NOT_IMPLEMENTED) { | 1039 | if (ret_stuff.status == SALRET_NOT_IMPLEMENTED) { |
1040 | int nasid = get_sapicid() & 0xfff;; | 1040 | int nasid = get_sapicid() & 0xfff; |
1041 | #define SH_SHUB_ID_NODES_PER_BIT_MASK 0x001f000000000000UL | 1041 | #define SH_SHUB_ID_NODES_PER_BIT_MASK 0x001f000000000000UL |
1042 | #define SH_SHUB_ID_NODES_PER_BIT_SHFT 48 | 1042 | #define SH_SHUB_ID_NODES_PER_BIT_SHFT 48 |
1043 | if (shubtype) *shubtype = 0; | 1043 | if (shubtype) *shubtype = 0; |