git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'fix/hda' into for-linus
[sfrench/cifs-2.6.git]
/
drivers
/
acpi
/
Makefile
diff --git
a/drivers/acpi/Makefile
b/drivers/acpi/Makefile
index d80f4cc2e0da31c9e3679320f473122c447b4aa2..65d90c720b5a63995179235af6683577e112cc44 100644
(file)
--- a/
drivers/acpi/Makefile
+++ b/
drivers/acpi/Makefile
@@
-19,7
+19,7
@@
obj-y += osl.o utils.o reboot.o\
# sleep related files
obj-y += wakeup.o
-obj-y +=
main
.o
+obj-y +=
sleep
.o
obj-$(CONFIG_ACPI_SLEEP) += proc.o