Merge branch 'dmapool' of git://git.kernel.org/pub/scm/linux/kernel/git/willy/misc

[linux-2.6] / drivers / ide / pci / triflex.c

diff --git a/drivers/ide/pci/triflex.c b/drivers/ide/pci/triflex.c
index ca49cd7f9555652748a8f2d1f315f4ed4829b938..a67d02a3f96e108484f42b71cbbbeec9dc97a6aa 100644 (file)
--- a/drivers/ide/pci/triflex.c
+++ b/drivers/ide/pci/triflex.c
@@ -1,6 +1,4 @@
 /*
- * triflex.c
- * 
  * IDE Chipset driver for the Compaq TriFlex IDE controller.
  * 
  * Known to work with the Compaq Workstation 5x00 series.
@@ -30,11 +28,6 @@
 #include <linux/types.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
-#include <linux/delay.h>
-#include <linux/timer.h>
-#include <linux/mm.h>
-#include <linux/ioport.h>
-#include <linux/blkdev.h>
 #include <linux/hdreg.h>
 #include <linux/pci.h>
 #include <linux/ide.h>