diff --git a/config-generic b/config-generic
index 1bb85ed86..67b0d2840 100644
--- a/config-generic
+++ b/config-generic
@@ -437,8 +437,7 @@ CONFIG_AIC79XX_RESET_DELAY_MS=15000
 # CONFIG_AIC79XX_DEBUG_ENABLE is not set
 CONFIG_AIC79XX_DEBUG_MASK=0
 # CONFIG_AIC79XX_REG_PRETTY_PRINT is not set
-CONFIG_SCSI_AIC94XX=m
-# CONFIG_AIC94XX_DEBUG is not set
+# CONFIG_SCSI_AIC94XX is not set
 # CONFIG_SCSI_ADVANSYS is not set
 CONFIG_SCSI_BFA_FC=m
 CONFIG_MEGARAID_NEWGEN=y
diff --git a/kernel.spec b/kernel.spec
index 06b2ea4e1..228742c5f 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2168,6 +2168,7 @@ fi
 #                                    ||     ||
 %changelog
 * Wed Jan 08 2014 Josh Boyer <jwboyer@fedoraproject.org>
+- Disable aic94xx driver (from Paul Bolle)
 - Backport support for ALPS Dolphin devices (rhbz 953211)
 
 * Wed Jan 08 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.13.0-0.rc7.git2.1