1 files changed, 0 insertions, 24 deletions

diff --git a/drivers/message/fusion/mptbase.c b/drivers/message/fusion/mptbase.c
index 187f83629f7e..5dcc0313c38a 100644
--- a/drivers/message/fusion/mptbase.c
+++ b/drivers/message/fusion/mptbase.c
@@ -59,10 +59,6 @@
 #include <linux/delay.h>
 #include <linux/interrupt.h>            /* needed for in_interrupt() proto */
 #include <linux/dma-mapping.h>
-#include <asm/io.h>
-#ifdef CONFIG_MTRR
-#include <asm/mtrr.h>
-#endif
 #include <linux/kthread.h>
 #include <scsi/scsi_host.h>
 
@@ -2820,13 +2816,6 @@ mpt_adapter_dispose(MPT_ADAPTER *ioc)
         pci_disable_device(ioc->pcidev);
         pci_release_selected_regions(ioc->pcidev, ioc->bars);
 
-#if defined(CONFIG_MTRR) && 0
-        if (ioc->mtrr_reg > 0) {
-                mtrr_del(ioc->mtrr_reg, 0, 0);
-                dprintk(ioc, printk(MYIOC_s_INFO_FMT "MTRR region de-registered\n", ioc->name));
-        }
-#endif
-
         /*  Zap the adapter lookup ptr!  */
         list_del(&ioc->list);
 
@@ -4512,19 +4501,6 @@ PrimeIocFifos(MPT_ADAPTER *ioc)
 
                 ioc->req_frames_low_dma = (u32) (alloc_dma & 0xFFFFFFFF);
 
-#if defined(CONFIG_MTRR) && 0
-                /*
-                 *  Enable Write Combining MTRR for IOC's memory region.
-                 *  (at least as much as we can; "size and base must be
-                 *  multiples of 4 kiB"
-                 */
-                ioc->mtrr_reg = mtrr_add(ioc->req_frames_dma,
-                                         sz,
-                                         MTRR_TYPE_WRCOMB, 1);
-                dprintk(ioc, printk(MYIOC_s_DEBUG_FMT "MTRR region registered (base:size=%08x:%x)\n",
-                                ioc->name, ioc->req_frames_dma, sz));
-#endif
-
                 for (i = 0; i < ioc->req_depth; i++) {
                         alloc_dma += ioc->req_sz;
                         mem += ioc->req_sz;