3.7.1 (and linux-next): doesn't compile without CONFIG_ACPI

[Alexei Colin]

Hi,

Is the following worth forwarding to the main list? It might be an
artifact of my cross-compilation toolchain.

Compilation without CONFIG_ACPI fails [1] because the headers
include/acpi/* throw errors if included without CONFIG_ACPI. They are
included unconditionally from two places:

(1) acpi/acpi.h from iscsi_ibft.h from arch/x86/kernel/setup.c. The
include of iscsi_ibft.h was harmless until an include of acpi/acpi.h was
added to it in 4e639fdf0d0d745648aa62228ab8a0d9c03a563f

(2) acpi/acpi_bus.h from pci-label.c, which used to only be compiled
when ACPI was on, but that changed in
8a226e00eeed8db843d4a580013a49ae3559bcd7 to compile it even when only
DMI and not ACPI is on.

Putting CONFIG_ACPI guards around both includes lets the compilation
proceed.

[1] The errors are of this nature:
include/acpi/actypes.h:55:2: error: #error ACPI_MACHINE_WIDTH not defined