]> www.pilppa.org Git - linux-2.6-omap-h63xx.git/commitdiff
projects / linux-2.6-omap-h63xx.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from parent 2: 0d5f221)
Merge branch 'omap-pool'
authorTony Lindgren <tony@atomide.com>
Tue, 7 Apr 2009 23:27:19 +0000 (16:27 -0700)
committerTony Lindgren <tony@atomide.com>
Tue, 7 Apr 2009 23:27:19 +0000 (16:27 -0700)
Conflicts:
drivers/Makefile

drivers/Makefile patch | blob | history

diff --git a/drivers/Makefile b/drivers/Makefile
index 625f69d8ecdc7f618e96e06efd0eba2edaaf03a3..9efb73cbf2e446c97a53f9649bd78b24f1b48b45 100644 (file)
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -43,6 +43,7 @@ obj-y                         += serial/
 obj-$(CONFIG_PARPORT)          += parport/
 obj-y                          += base/ block/ misc/ mfd/ media/
 obj-y                          += i2c/
+obj-y                          += cbus/
 obj-$(CONFIG_NUBUS)            += nubus/
 obj-y                          += macintosh/
 obj-$(CONFIG_IDE)              += ide/
Unnamed repository; edit this file 'description' to name the repository.