diff options
| author | Len Brown <len.brown@intel.com> | 2005-08-24 12:07:20 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2005-08-24 12:08:54 -0400 |
| commit | 888ba6c62bc61a995d283977eb3a6cbafd6f4ac6 (patch) | |
| tree | 2a1614a7c63460e98f55ac5905f3a4be679138f1 /arch/i386/mach-es7000/es7000plat.c | |
| parent | 84ffa747520edd4556b136bdfc9df9eb1673ce12 (diff) | |
[ACPI] delete CONFIG_ACPI_BOOT
it has been a synonym for CONFIG_ACPI since 2.6.12
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'arch/i386/mach-es7000/es7000plat.c')
| -rw-r--r-- | arch/i386/mach-es7000/es7000plat.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/i386/mach-es7000/es7000plat.c b/arch/i386/mach-es7000/es7000plat.c index d5936d500479..baac9da042ce 100644 --- a/arch/i386/mach-es7000/es7000plat.c +++ b/arch/i386/mach-es7000/es7000plat.c | |||
| @@ -51,7 +51,7 @@ struct mip_reg *host_reg; | |||
| 51 | int mip_port; | 51 | int mip_port; |
| 52 | unsigned long mip_addr, host_addr; | 52 | unsigned long mip_addr, host_addr; |
| 53 | 53 | ||
| 54 | #if defined(CONFIG_X86_IO_APIC) && (defined(CONFIG_ACPI_INTERPRETER) || defined(CONFIG_ACPI_BOOT)) | 54 | #if defined(CONFIG_X86_IO_APIC) && defined(CONFIG_ACPI_INTERPRETER) |
| 55 | 55 | ||
| 56 | /* | 56 | /* |
| 57 | * GSI override for ES7000 platforms. | 57 | * GSI override for ES7000 platforms. |
| @@ -73,7 +73,7 @@ es7000_rename_gsi(int ioapic, int gsi) | |||
| 73 | return gsi; | 73 | return gsi; |
| 74 | } | 74 | } |
| 75 | 75 | ||
| 76 | #endif // (CONFIG_X86_IO_APIC) && (CONFIG_ACPI_INTERPRETER || CONFIG_ACPI_BOOT) | 76 | #endif // (CONFIG_X86_IO_APIC) && (CONFIG_ACPI_INTERPRETER) |
| 77 | 77 | ||
| 78 | /* | 78 | /* |
| 79 | * Parse the OEM Table | 79 | * Parse the OEM Table |