diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-26 20:19:41 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-26 20:19:41 -0700 |
commit | 5c7c204aeca51ccfad63caab4fcdc5d8026c0fd8 (patch) | |
tree | 4bfd5f4455b706c9ba86a8925bf367f437d16336 /drivers/isdn/Makefile | |
parent | 228428428138e231a155464239880201e5cc8b44 (diff) | |
parent | 3712b42d4b1bec29a4232a6673bf2e6dcc5faa68 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/kkeil/ISDN-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/kkeil/ISDN-2.6:
Add layer1 over IP support
Add mISDN HFC multiport driver
Add mISDN HFC PCI driver
Add mISDN DSP
Add mISDN core files
Define AF_ISDN and PF_ISDN
Add mISDN driver
Diffstat (limited to 'drivers/isdn/Makefile')
-rw-r--r-- | drivers/isdn/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/isdn/Makefile b/drivers/isdn/Makefile index 988142c30a6..8380a4568d1 100644 --- a/drivers/isdn/Makefile +++ b/drivers/isdn/Makefile @@ -4,6 +4,7 @@ obj-$(CONFIG_ISDN_I4L) += i4l/ obj-$(CONFIG_ISDN_CAPI) += capi/ +obj-$(CONFIG_MISDN) += mISDN/ obj-$(CONFIG_ISDN_CAPI) += hardware/ obj-$(CONFIG_ISDN_DIVERSION) += divert/ obj-$(CONFIG_ISDN_DRV_HISAX) += hisax/ |