git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6
[sfrench/cifs-2.6.git]
/
drivers
/
isdn
/
i4l
/
Kconfig
diff --git
a/drivers/isdn/i4l/Kconfig
b/drivers/isdn/i4l/Kconfig
index 36778b270c303aa0a8ae57c4feb85966a3ebee92..ed3510f273d82b616c328c6f59367a9d262de6b7 100644
(file)
--- a/
drivers/isdn/i4l/Kconfig
+++ b/
drivers/isdn/i4l/Kconfig
@@
-135,5
+135,3
@@
source "drivers/isdn/act2000/Kconfig"
source "drivers/isdn/hysdn/Kconfig"
endmenu
-
-source "drivers/isdn/gigaset/Kconfig"