aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBob Moore <robert.moore@intel.com>2008-11-12 01:16:21 -0500
committerLen Brown <len.brown@intel.com>2008-12-29 22:38:36 -0500
commit6de4048a416d46eb2ac6597d03d2b58806a6b800 (patch)
treeca04d7e3088c9f8d302135e4e6ba266106ee024b
parent4a6908a3a050aacc9c3a2f36b276b46c0629ad91 (diff)
ACPICA: Fix several warnings under gcc 4 compiler
New compiler is pickier than older versions. Joerg Sonnenberger. From ACPICA BZ 732. http://www.acpica.org/bugzilla/show_bug.cgi?id=732 Signed-off-by: Bob Moore <robert.moore@intel.com> Signed-off-by: Lin Ming <ming.m.lin@intel.com> Signed-off-by: Len Brown <len.brown@intel.com>
-rw-r--r--drivers/acpi/tables/tbfadt.c4
-rw-r--r--include/acpi/actypes.h8
2 files changed, 6 insertions, 6 deletions
diff --git a/drivers/acpi/tables/tbfadt.c b/drivers/acpi/tables/tbfadt.c
index 2817158fb6a1..d2e60a8fa9a5 100644
--- a/drivers/acpi/tables/tbfadt.c
+++ b/drivers/acpi/tables/tbfadt.c
@@ -48,7 +48,7 @@
48ACPI_MODULE_NAME("tbfadt") 48ACPI_MODULE_NAME("tbfadt")
49 49
50/* Local prototypes */ 50/* Local prototypes */
51static void inline 51static inline void
52acpi_tb_init_generic_address(struct acpi_generic_address *generic_address, 52acpi_tb_init_generic_address(struct acpi_generic_address *generic_address,
53 u8 byte_width, u64 address); 53 u8 byte_width, u64 address);
54 54
@@ -122,7 +122,7 @@ static struct acpi_fadt_info fadt_info_table[] = {
122 * 122 *
123 ******************************************************************************/ 123 ******************************************************************************/
124 124
125static void inline 125static inline void
126acpi_tb_init_generic_address(struct acpi_generic_address *generic_address, 126acpi_tb_init_generic_address(struct acpi_generic_address *generic_address,
127 u8 byte_width, u64 address) 127 u8 byte_width, u64 address)
128{ 128{
diff --git a/include/acpi/actypes.h b/include/acpi/actypes.h
index 7220361790b3..a9719d69e72e 100644
--- a/include/acpi/actypes.h
+++ b/include/acpi/actypes.h
@@ -291,7 +291,7 @@ typedef u32 acpi_physical_address;
291#endif 291#endif
292 292
293/* 293/*
294 * Mescellaneous types 294 * Miscellaneous types
295 */ 295 */
296typedef u32 acpi_status; /* All ACPI Exceptions */ 296typedef u32 acpi_status; /* All ACPI Exceptions */
297typedef u32 acpi_name; /* 4-byte ACPI name */ 297typedef u32 acpi_name; /* 4-byte ACPI name */
@@ -319,7 +319,7 @@ struct uint32_struct {
319#define acpi_semaphore void * 319#define acpi_semaphore void *
320 320
321/* 321/*
322 * Acpi integer width. In ACPI version 1, integers are 32 bits. In ACPI 322 * Acpi integer width. In ACPI version 1, integers are 32 bits. In ACPI
323 * version 2, integers are 64 bits. Note that this pertains to the ACPI integer 323 * version 2, integers are 64 bits. Note that this pertains to the ACPI integer
324 * type only, not other integers used in the implementation of the ACPI CA 324 * type only, not other integers used in the implementation of the ACPI CA
325 * subsystem. 325 * subsystem.
@@ -414,7 +414,7 @@ typedef unsigned long long acpi_integer;
414#define ACPI_NOTIFY_MAX 0x0B 414#define ACPI_NOTIFY_MAX 0x0B
415 415
416/* 416/*
417 * Types associated with ACPI names and objects. The first group of 417 * Types associated with ACPI names and objects. The first group of
418 * values (up to ACPI_TYPE_EXTERNAL_MAX) correspond to the definition 418 * values (up to ACPI_TYPE_EXTERNAL_MAX) correspond to the definition
419 * of the ACPI object_type() operator (See the ACPI Spec). Therefore, 419 * of the ACPI object_type() operator (See the ACPI Spec). Therefore,
420 * only add to the first group if the spec changes. 420 * only add to the first group if the spec changes.
@@ -787,7 +787,7 @@ acpi_status(*acpi_exception_handler) (acpi_status aml_status,
787 u16 opcode, 787 u16 opcode,
788 u32 aml_offset, void *context); 788 u32 aml_offset, void *context);
789 789
790/* Table Event handler (Load, load_table etc) and types */ 790/* Table Event handler (Load, load_table, etc.) and types */
791 791
792typedef 792typedef
793acpi_status(*acpi_tbl_handler) (u32 event, void *table, void *context); 793acpi_status(*acpi_tbl_handler) (u32 event, void *table, void *context);