diff options
| author | Len Brown <len.brown@intel.com> | 2008-02-09 04:32:47 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2008-02-09 04:32:47 -0500 |
| commit | d47b180c26c22d78c2428117abb7e6beba00b7ef (patch) | |
| tree | a71fe62835a144a91d8b2ba10bd06ef42c804d06 /drivers/acpi/Makefile | |
| parent | 249d621a85668b3b09296fbcfcf1cb5e9372a5ea (diff) | |
| parent | bbafbecb24190959d77a8fee7bd23798b81e25c2 (diff) | |
Merge branches 'release' and 'bugzilla-9910' into release
Diffstat (limited to 'drivers/acpi/Makefile')
| -rw-r--r-- | drivers/acpi/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/Makefile b/drivers/acpi/Makefile index f29812a86533..40b0fcae4c78 100644 --- a/drivers/acpi/Makefile +++ b/drivers/acpi/Makefile | |||
| @@ -60,5 +60,5 @@ obj-$(CONFIG_ACPI_ASUS) += asus_acpi.o | |||
| 60 | obj-$(CONFIG_ACPI_TOSHIBA) += toshiba_acpi.o | 60 | obj-$(CONFIG_ACPI_TOSHIBA) += toshiba_acpi.o |
| 61 | obj-$(CONFIG_ACPI_HOTPLUG_MEMORY) += acpi_memhotplug.o | 61 | obj-$(CONFIG_ACPI_HOTPLUG_MEMORY) += acpi_memhotplug.o |
| 62 | obj-$(CONFIG_ACPI_PROCFS_POWER) += cm_sbs.o | 62 | obj-$(CONFIG_ACPI_PROCFS_POWER) += cm_sbs.o |
| 63 | obj-$(CONFIG_ACPI_SBS) += sbs.o | ||
| 64 | obj-$(CONFIG_ACPI_SBS) += sbshc.o | 63 | obj-$(CONFIG_ACPI_SBS) += sbshc.o |
| 64 | obj-$(CONFIG_ACPI_SBS) += sbs.o | ||