Merge branch 'linux-2.6' into for-2.6.24

1 files changed, 5 insertions, 0 deletions

diff --git a/drivers/atm/Kconfig b/drivers/atm/Kconfig
index bed9f58c2d5a..b554edac1ced 100644
--- a/drivers/atm/Kconfig
+++ b/drivers/atm/Kconfig
@@ -6,6 +6,11 @@ menuconfig ATM_DRIVERS
         bool "ATM drivers"
         depends on NETDEVICES && ATM
         default y
+        ---help---
+          Say Y here to get to see options for Asynchronous Transfer Mode
+          device drivers. This option alone does not add any kernel code.
+
+          If you say N, all options in this submenu will be skipped and disabled.
 
 if ATM_DRIVERS && NETDEVICES && ATM