diff options
author | Jeff Garzik <jeff@garzik.org> | 2006-03-29 19:58:22 -0500 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2006-03-29 19:58:22 -0500 |
commit | 79072f38909e3d9883317238887460c39ddcc4cb (patch) | |
tree | 28369f5a844535ff836565eefd62695b0e890fa3 /drivers/isdn/i4l/Kconfig | |
parent | 200d5a7684cc49ef4be40e832daf3f217e70dfbb (diff) | |
parent | 55d8ca4f8094246da6e71889a4e04bfafaa78b10 (diff) | |
download | op-kernel-dev-79072f38909e3d9883317238887460c39ddcc4cb.zip op-kernel-dev-79072f38909e3d9883317238887460c39ddcc4cb.tar.gz |
Merge branch 'upstream'
Diffstat (limited to 'drivers/isdn/i4l/Kconfig')
-rw-r--r-- | drivers/isdn/i4l/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/isdn/i4l/Kconfig b/drivers/isdn/i4l/Kconfig index 1789b60..a4f7288 100644 --- a/drivers/isdn/i4l/Kconfig +++ b/drivers/isdn/i4l/Kconfig @@ -139,3 +139,4 @@ source "drivers/isdn/hysdn/Kconfig" endmenu +source "drivers/isdn/gigaset/Kconfig" |