Merge git://git.infradead.org/mtd-2.6

[~andy/linux] / drivers / Makefile

diff --git a/drivers/Makefile b/drivers/Makefile
index 0ea8e3237c0d0cbf381621841ae6fde722bb58cd..a168eacdcd9c1d57333e9da931d26a712ffb01c2 100644 (file)
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -66,6 +66,7 @@ obj-y                         += i2c/
 obj-$(CONFIG_W1)               += w1/
 obj-$(CONFIG_POWER_SUPPLY)     += power/
 obj-$(CONFIG_HWMON)            += hwmon/
+obj-$(CONFIG_WATCHDOG)         += char/watchdog/
 obj-$(CONFIG_PHONE)            += telephony/
 obj-$(CONFIG_MD)               += md/
 obj-$(CONFIG_BT)               += bluetooth/
@@ -86,3 +87,5 @@ obj-$(CONFIG_GENERIC_TIME)    += clocksource/
 obj-$(CONFIG_DMA_ENGINE)       += dma/
 obj-$(CONFIG_HID)              += hid/
 obj-$(CONFIG_PPC_PS3)          += ps3/
+obj-$(CONFIG_OF)               += of/
+obj-$(CONFIG_SSB)              += ssb/