Merge branch 'release-2.6.27' of git://git.kernel.org/pub/scm/linux/kernel/git/ak...

[linux-2.6] / drivers / isdn / Makefile

diff --git a/drivers/isdn/Makefile b/drivers/isdn/Makefile
index 03d8ccd51955ce381ea4aaf7077cd9bb409339da..f1f777570e8e662417aa99a59f3004422ade771c 100644 (file)
--- a/drivers/isdn/Makefile
+++ b/drivers/isdn/Makefile
@@ -4,7 +4,8 @@
 
 obj-$(CONFIG_ISDN_I4L)                 += i4l/
 obj-$(CONFIG_ISDN_CAPI)                        += capi/
-obj-$(CONFIG_ISDN_CAPI)                        += hardware/
+obj-$(CONFIG_MISDN)                    += mISDN/
+obj-$(CONFIG_ISDN)                     += hardware/
 obj-$(CONFIG_ISDN_DIVERSION)           += divert/
 obj-$(CONFIG_ISDN_DRV_HISAX)           += hisax/
 obj-$(CONFIG_ISDN_DRV_ICN)             += icn/
@@ -13,3 +14,4 @@ obj-$(CONFIG_ISDN_DRV_SC)             += sc/
 obj-$(CONFIG_ISDN_DRV_LOOP)            += isdnloop/
 obj-$(CONFIG_ISDN_DRV_ACT2000)         += act2000/
 obj-$(CONFIG_HYSDN)                    += hysdn/
+obj-$(CONFIG_ISDN_DRV_GIGASET)         += gigaset/