Some of the #ifdef CONFIG_ACPI are not needed anymore, so they can be
removed.
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>