diff --git a/[refs] b/[refs]
index 8e4634f4d6e9..2317af4f7ae8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: caff5b6a6bfd0c55b359b2b4acd8c14f828b689e
+refs/heads/master: 52a91071306c3b129efa6ea2bfe16244b8619cd9
diff --git a/trunk/drivers/atm/Kconfig b/trunk/drivers/atm/Kconfig
index 2ddd76fdbc43..33687454eb32 100644
--- a/trunk/drivers/atm/Kconfig
+++ b/trunk/drivers/atm/Kconfig
@@ -167,10 +167,6 @@ config ATM_ZATM_DEBUG
 	  Note that extended debugging may create certain race conditions
 	  itself. Enable this ONLY if you suspect problems with the driver.
 
-#   bool 'Rolfs TI TNETA1570' CONFIG_ATM_TNETA1570 y
-#   if [ "$CONFIG_ATM_TNETA1570" = "y" ]; then
-#      bool '  Enable extended debugging' CONFIG_ATM_TNETA1570_DEBUG n
-#   fi
 config ATM_NICSTAR
 	tristate "IDT 77201 (NICStAR) (ForeRunnerLE)"
 	depends on PCI && ATM && !64BIT