diff --git a/[refs] b/[refs]
index d4c351c75946..6573ba3a8733 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ad7e484fad0d6b35c4788d265e4e7e1122b960f7
+refs/heads/master: 47738a75cdf3fb6793a834ec5c4dc2c6a88e510a
diff --git a/trunk/arch/m68k/Kconfig b/trunk/arch/m68k/Kconfig
index 65db2261b9ea..6649346f7dda 100644
--- a/trunk/arch/m68k/Kconfig
+++ b/trunk/arch/m68k/Kconfig
@@ -539,13 +539,6 @@ config AMIGA_BUILTIN_SERIAL
 
 	  To compile this driver as a module, choose M here.
 
-config WHIPPET_SERIAL
-	tristate "Hisoft Whippet PCMCIA serial support"
-	depends on AMIGA_PCMCIA
-	help
-	  HiSoft has a web page at <http://www.hisoft.co.uk/>, but there
-	  is no listing for the Whippet in their Amiga section.
-
 config MULTIFACE_III_TTY
 	tristate "Multiface Card III serial support"
 	depends on AMIGA