git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge mainline v2.6.27-rc2 tree into linux-omap tree
[pandora-kernel.git]
/
drivers
/
misc
/
Makefile
diff --git
a/drivers/misc/Makefile
b/drivers/misc/Makefile
index
c6c13f6
..
b6167e7
100644
(file)
--- a/
drivers/misc/Makefile
+++ b/
drivers/misc/Makefile
@@
-5,6
+5,7
@@
obj- := misc.o # Dummy rule to force built-in.o to be made
obj-$(CONFIG_IBM_ASM) += ibmasm/
obj-$(CONFIG_HDPU_FEATURES) += hdpuftrs/
+obj-$(CONFIG_OMAP_STI) += sti/
obj-$(CONFIG_ASUS_LAPTOP) += asus-laptop.o
obj-$(CONFIG_EEEPC_LAPTOP) += eeepc-laptop.o
obj-$(CONFIG_MSI_LAPTOP) += msi-laptop.o