Merge with ../linux-2.6

[linux-2.6-omap-h63xx.git] / drivers / Makefile

diff --git a/drivers/Makefile b/drivers/Makefile
index fac1e1603097d46bcc66e076c083601cfa37c52f..9749f6d59ea69a32c45b4daf129f69a066c3ec9b 100644 (file)
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -29,7 +29,9 @@ obj-$(CONFIG_FB_INTEL)          += video/intelfb/
 obj-$(CONFIG_SERIO)            += input/serio/
 obj-y                          += serial/
 obj-$(CONFIG_PARPORT)          += parport/
-obj-y                          += base/ block/ misc/ mfd/ net/ media/
+obj-y                          += base/ block/ misc/ mfd/ net/
+obj-$(CONFIG_I2C)              += i2c/
+obj-y                          += media/ ssi/
 obj-$(CONFIG_NUBUS)            += nubus/
 obj-$(CONFIG_ATM)              += atm/
 obj-$(CONFIG_PPC_PMAC)         += macintosh/
@@ -53,7 +55,6 @@ obj-$(CONFIG_USB_GADGET)      += usb/gadget/
 obj-$(CONFIG_GAMEPORT)         += input/gameport/
 obj-$(CONFIG_INPUT)            += input/
 obj-$(CONFIG_I2O)              += message/
-obj-$(CONFIG_I2C)              += i2c/
 obj-$(CONFIG_W1)               += w1/
 obj-$(CONFIG_HWMON)            += hwmon/
 obj-$(CONFIG_PHONE)            += telephony/