]> www.pilppa.org Git - linux-2.6-omap-h63xx.git/blobdiff - drivers/misc/Makefile
Merge current mainline tree into linux-omap tree
[linux-2.6-omap-h63xx.git] / drivers / misc / Makefile
index 4581b2533111deb34f72a42d72bee4fdc8a7d63b..77ec228e55f348e3731c7e59bfff4bd03eab5c3b 100644 (file)
@@ -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_MSI_LAPTOP)     += msi-laptop.o
 obj-$(CONFIG_ACER_WMI)     += acer-wmi.o
 obj-$(CONFIG_ASUS_LAPTOP)     += asus-laptop.o
@@ -24,3 +25,4 @@ obj-$(CONFIG_EEPROM_93CX6)    += eeprom_93cx6.o
 obj-$(CONFIG_INTEL_MENLOW)     += intel_menlow.o
 obj-$(CONFIG_ENCLOSURE_SERVICES) += enclosure.o
 obj-$(CONFIG_KGDB_TESTS)       += kgdbts.o
+obj-$(CONFIG_SGI_XP)           += sgi-xp/