diff options
| author |   Jeff Garzik <jeff@garzik.org> | 2006-03-29 17:18:49 -0500 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-03-29 17:18:49 -0500 |
| commit | e02a4cabfcb9a999b74a2e2e6f13ffcb7ff2d606 (patch) | |
| tree | 2f3db60be4c57eca2a4c3ab3f3122dcf1ec0c624 /drivers/isdn/i4l/Kconfig | |
| parent | [PATCH] libata: add FIXME above ata_dev_xfermask() (diff) | |
| parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 (diff) | |
| download | linux-dev-e02a4cabfcb9a999b74a2e2e6f13ffcb7ff2d606.tar.xz linux-dev-e02a4cabfcb9a999b74a2e2e6f13ffcb7ff2d606.zip | |
Merge branch 'master'
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 1789b607f090..a4f7288a1fc8 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" |