diff options
| author | Len Brown <len.brown@intel.com> | 2010-01-20 01:23:27 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2010-01-20 01:23:27 -0500 |
| commit | be6066f34c948ccf4adcc90bbeb1fd335d663303 (patch) | |
| tree | 551d2cf4934e7101e2e668347d85f47663a77e7c /include | |
| parent | b4cdd6ac4f9b73118542a5c4e796e6b9f287d0dd (diff) | |
| parent | 7f07a605a3929d2d94dcbad8ccb7d280958d21f9 (diff) | |
Merge branch 'misc' into release
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/acpi.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/acpi.h b/include/linux/acpi.h index 36924255c0d5..b926afe8c03e 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h | |||
| @@ -80,7 +80,7 @@ char * __acpi_map_table (unsigned long phys_addr, unsigned long size); | |||
| 80 | void __acpi_unmap_table(char *map, unsigned long size); | 80 | void __acpi_unmap_table(char *map, unsigned long size); |
| 81 | int early_acpi_boot_init(void); | 81 | int early_acpi_boot_init(void); |
| 82 | int acpi_boot_init (void); | 82 | int acpi_boot_init (void); |
| 83 | int acpi_boot_table_init (void); | 83 | void acpi_boot_table_init (void); |
| 84 | int acpi_mps_check (void); | 84 | int acpi_mps_check (void); |
| 85 | int acpi_numa_init (void); | 85 | int acpi_numa_init (void); |
| 86 | 86 | ||
| @@ -321,9 +321,9 @@ static inline int acpi_boot_init(void) | |||
| 321 | return 0; | 321 | return 0; |
| 322 | } | 322 | } |
| 323 | 323 | ||
| 324 | static inline int acpi_boot_table_init(void) | 324 | static inline void acpi_boot_table_init(void) |
| 325 | { | 325 | { |
| 326 | return 0; | 326 | return; |
| 327 | } | 327 | } |
| 328 | 328 | ||
| 329 | static inline int acpi_mps_check(void) | 329 | static inline int acpi_mps_check(void) |