Merge with http://kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git

[linux-2.6] / drivers / atm / Kconfig

diff --git a/drivers/atm/Kconfig b/drivers/atm/Kconfig
index 489de81ea6090814ade9c6746de975fe209ad073..01a9f1cb77438eeff822a5ac3a825179a72e8028 100644 (file)
--- a/drivers/atm/Kconfig
+++ b/drivers/atm/Kconfig
@@ -5,6 +5,13 @@
 menu "ATM drivers"
        depends on NETDEVICES && ATM
 
+config ATM_DUMMY
+       tristate "Dummy ATM driver"
+       depends on ATM
+       help
+         Dummy ATM driver. Useful for proxy signalling, testing,
+         and development.  If unsure, say N.
+
 config ATM_TCP
        tristate "ATM over TCP"
        depends on INET && ATM