diff --git a/config-generic b/config-generic
index 7e50163e7..d1793348d 100644
--- a/config-generic
+++ b/config-generic
@@ -2017,7 +2017,7 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4
 CONFIG_SERIAL_8250_EXTENDED=y
 CONFIG_SERIAL_8250_MANY_PORTS=y
 CONFIG_SERIAL_8250_SHARE_IRQ=y
-CONFIG_SERIAL_8250_DETECT_IRQ=y
+# CONFIG_SERIAL_8250_DETECT_IRQ is not set
 CONFIG_SERIAL_8250_RSA=y
 # CONFIG_COMPUTONE is not set
 CONFIG_CYCLADES=m
diff --git a/kernel.spec b/kernel.spec
index 0a9c39857..30ad43e1b 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -1964,6 +1964,9 @@ fi
 #                 ||----w |
 #                 ||     ||
 %changelog
+* Mon Jan 31 2011 Kyle McMartin <kmcmartin@redhat.com>
+- disable CONFIG_SERIAL_8250_DETECT_IRQ (from mschmidt@redhat.com)
+
 * Mon Jan 31 2011 Chuck Ebbert <cebbert@redhat.com>
 - Linux 2.6.38-rc2-git8
 - Add Trond's NFS bugfixes branch from git.linux-nfs.org