The patch titled
acpi: cleanup <linux/acpi.h>
has been removed from the -mm tree. Its filename was
acpi-cleanup-linux-acpih.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: acpi: cleanup <linux/acpi.h>
From: Jean Delvare <jdelvare@xxxxxxx>
Two cleanups to <linux/acpi.h>:
* Stop defining acpi_mp_config, it isn't used anywhere.
* Discard nested "#ifdef CONFIG_ACPI", they are useless and
error-prone.
Signed-off-by: Jean Delvare <jdelvare@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
include/linux/acpi.h | 14 --------------
1 file changed, 14 deletions(-)
diff -puN include/linux/acpi.h~acpi-cleanup-linux-acpih include/linux/acpi.h
--- a/include/linux/acpi.h~acpi-cleanup-linux-acpih
+++ a/include/linux/acpi.h
@@ -42,8 +42,6 @@
#include <asm/acpi.h>
-#ifdef CONFIG_ACPI
-
enum acpi_irq_model_id {
ACPI_IRQ_MODEL_PIC = 0,
ACPI_IRQ_MODEL_IOAPIC,
@@ -114,20 +112,12 @@ int acpi_unmap_lsapic(int cpu);
int acpi_register_ioapic(acpi_handle handle, u64 phys_addr, u32 gsi_base);
int acpi_unregister_ioapic(acpi_handle handle, u32 gsi_base);
-extern int acpi_mp_config;
-
extern struct acpi_mcfg_allocation *pci_mmcfg_config;
extern int pci_mmcfg_config_num;
extern int sbf_port;
extern unsigned long acpi_realmode_flags;
-#else /* !CONFIG_ACPI */
-
-#define acpi_mp_config 0
-
-#endif /* !CONFIG_ACPI */
-
int acpi_register_gsi (u32 gsi, int triggering, int polarity);
int acpi_gsi_to_irq (u32 gsi, unsigned int *irq);
@@ -143,8 +133,6 @@ extern int acpi_get_override_irq(int bus
*/
void acpi_unregister_gsi (u32 gsi);
-#ifdef CONFIG_ACPI
-
struct acpi_prt_entry {
struct list_head node;
struct acpi_pci_id id;
@@ -177,8 +165,6 @@ struct acpi_pci_driver {
int acpi_pci_register_driver(struct acpi_pci_driver *driver);
void acpi_pci_unregister_driver(struct acpi_pci_driver *driver);
-#endif /* CONFIG_ACPI */
-
#ifdef CONFIG_ACPI_EC
extern int ec_read(u8 addr, u8 *val);
_
Patches currently in -mm which might be from jdelvare@xxxxxxx are
git-acpi.patch
export-acpi_check_resource_conflict.patch
check-for-acpi-resource-conflicts-in-i2c-bus-drivers.patch
check-for-acpi-resource-conflicts-in-hwmon-drivers.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
