diff options
| author | Len Brown <len.brown@intel.com> | 2009-01-09 04:01:26 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2009-01-09 04:56:56 -0500 |
| commit | d97c0defba25a959a990f6d4759f43075540832e (patch) | |
| tree | 27dceaf310e01a6bbcceee3550112b19202f142f /drivers/acpi/Makefile | |
| parent | ec9f168fcc344d2ffec1c8c822076bf22dab5c33 (diff) | |
| parent | b4f9fe12157a33351d0df78e925dcacd13252783 (diff) | |
Merge branch 'drivers-platform' into release
Conflicts:
drivers/misc/Kconfig
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi/Makefile')
| -rw-r--r-- | drivers/acpi/Makefile | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/acpi/Makefile b/drivers/acpi/Makefile index 5d23c13ac7d4..d80f4cc2e0da 100644 --- a/drivers/acpi/Makefile +++ b/drivers/acpi/Makefile | |||
| @@ -55,9 +55,6 @@ obj-y += power.o | |||
| 55 | obj-$(CONFIG_ACPI_SYSTEM) += system.o event.o | 55 | obj-$(CONFIG_ACPI_SYSTEM) += system.o event.o |
| 56 | obj-$(CONFIG_ACPI_DEBUG) += debug.o | 56 | obj-$(CONFIG_ACPI_DEBUG) += debug.o |
| 57 | obj-$(CONFIG_ACPI_NUMA) += numa.o | 57 | obj-$(CONFIG_ACPI_NUMA) += numa.o |
| 58 | obj-$(CONFIG_ACPI_WMI) += wmi.o | ||
| 59 | obj-$(CONFIG_ACPI_ASUS) += asus_acpi.o | ||
| 60 | obj-$(CONFIG_ACPI_TOSHIBA) += toshiba_acpi.o | ||
| 61 | obj-$(CONFIG_ACPI_HOTPLUG_MEMORY) += acpi_memhotplug.o | 58 | obj-$(CONFIG_ACPI_HOTPLUG_MEMORY) += acpi_memhotplug.o |
| 62 | obj-$(CONFIG_ACPI_PROCFS_POWER) += cm_sbs.o | 59 | obj-$(CONFIG_ACPI_PROCFS_POWER) += cm_sbs.o |
| 63 | obj-$(CONFIG_ACPI_SBS) += sbshc.o | 60 | obj-$(CONFIG_ACPI_SBS) += sbshc.o |