diff options
| author | Dave Airlie <airlied@starflyer.(none)> | 2006-01-03 02:18:01 -0500 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2006-01-03 02:18:01 -0500 |
| commit | 97f2aab6698f3ab2552c41c1024a65ffd0763a6d (patch) | |
| tree | bb6e3b2949459f54f884c710fc74d40eef00d834 /drivers/atm/Kconfig | |
| parent | d985c1088146607532093d9eaaaf99758f6a4d21 (diff) | |
| parent | 88026842b0a760145aa71d69e74fbc9ec118ca44 (diff) | |
drm: merge in Linus mainline
Diffstat (limited to 'drivers/atm/Kconfig')
| -rw-r--r-- | drivers/atm/Kconfig | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/atm/Kconfig b/drivers/atm/Kconfig index 489de81ea609..01a9f1cb7743 100644 --- a/drivers/atm/Kconfig +++ b/drivers/atm/Kconfig | |||
| @@ -5,6 +5,13 @@ | |||
| 5 | menu "ATM drivers" | 5 | menu "ATM drivers" |
| 6 | depends on NETDEVICES && ATM | 6 | depends on NETDEVICES && ATM |
| 7 | 7 | ||
| 8 | config ATM_DUMMY | ||
| 9 | tristate "Dummy ATM driver" | ||
| 10 | depends on ATM | ||
| 11 | help | ||
| 12 | Dummy ATM driver. Useful for proxy signalling, testing, | ||
| 13 | and development. If unsure, say N. | ||
| 14 | |||
| 8 | config ATM_TCP | 15 | config ATM_TCP |
| 9 | tristate "ATM over TCP" | 16 | tristate "ATM over TCP" |
| 10 | depends on INET && ATM | 17 | depends on INET && ATM |