diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-04 17:00:37 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-04 17:00:37 -0700 |
| commit | 82248a5e92793014d156a12dbcbba633794ce9f8 (patch) | |
| tree | c91d54ea1122d8faf69bf15c7b8e1dc6921296b4 /drivers/isdn/Makefile | |
| parent | c2d5cedadcd3976cfc1fa5590e3a73a059c6401a (diff) | |
| parent | 31981db0d0b665713ab3e9531f936fdb67947225 (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 DIP switch readout for HFC-4S IOB4ST
Fix remaining big endian issue of hfcmulti
mISDN cleanup user interface
mISDN fix main ISDN Makefile
Diffstat (limited to 'drivers/isdn/Makefile')
| -rw-r--r-- | drivers/isdn/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/isdn/Makefile b/drivers/isdn/Makefile index 8380a4568d1..f1f777570e8 100644 --- a/drivers/isdn/Makefile +++ b/drivers/isdn/Makefile @@ -5,7 +5,7 @@ obj-$(CONFIG_ISDN_I4L) += i4l/ obj-$(CONFIG_ISDN_CAPI) += capi/ obj-$(CONFIG_MISDN) += mISDN/ -obj-$(CONFIG_ISDN_CAPI) += hardware/ +obj-$(CONFIG_ISDN) += hardware/ obj-$(CONFIG_ISDN_DIVERSION) += divert/ obj-$(CONFIG_ISDN_DRV_HISAX) += hisax/ obj-$(CONFIG_ISDN_DRV_ICN) += icn/ |