summaryrefslogtreecommitdiff
path: root/drivers/isdn/capi/Makefile
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2011-05-23 02:35:33 (GMT)
committerPaul Mundt <lethal@linux-sh.org>2011-05-23 02:35:33 (GMT)
commit8ace5c4698ec8da53e69095596718d5a936433de (patch)
tree1f5959b3ac289e3bde420cc14109be0cc518a75a /drivers/isdn/capi/Makefile
parenta375b15164dd9264f724ad941825e52c90145151 (diff)
parent71a8638480eb8fb6cfabe2ee9ca3fbc6e3453a14 (diff)
downloadlinux-8ace5c4698ec8da53e69095596718d5a936433de.tar.xz
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into sh-latest
Diffstat (limited to 'drivers/isdn/capi/Makefile')
-rw-r--r--drivers/isdn/capi/Makefile1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/isdn/capi/Makefile b/drivers/isdn/capi/Makefile
index 57123e3..4d5b4b7 100644
--- a/drivers/isdn/capi/Makefile
+++ b/drivers/isdn/capi/Makefile
@@ -7,7 +7,6 @@
obj-$(CONFIG_ISDN_CAPI) += kernelcapi.o
obj-$(CONFIG_ISDN_CAPI_CAPI20) += capi.o
obj-$(CONFIG_ISDN_CAPI_CAPIDRV) += capidrv.o
-obj-$(CONFIG_ISDN_CAPI_CAPIFS) += capifs.o
# Multipart objects.