projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
[powerpc.git]
/
drivers
/
acpi
/
Makefile
diff --git
a/drivers/acpi/Makefile
b/drivers/acpi/Makefile
index
b6266e7
..
d4336f1
100644
(file)
--- a/
drivers/acpi/Makefile
+++ b/
drivers/acpi/Makefile
@@
-59,4
+59,4
@@
obj-$(CONFIG_ACPI_ASUS) += asus_acpi.o
obj-$(CONFIG_ACPI_TOSHIBA) += toshiba_acpi.o
obj-$(CONFIG_ACPI_HOTPLUG_MEMORY) += acpi_memhotplug.o
obj-y += cm_sbs.o
-obj-$(CONFIG_ACPI_SBS) +=
i2c_ec.o
sbs.o
+obj-$(CONFIG_ACPI_SBS) += sbs.o