Merge bk://kernel.bkbits.net/acme/scsi-2.6

into home.osdl.org:/home/torvalds/v2.5/linux

Merge bk://kernel.bkbits.net/acme/scsi-2.6
into home.osdl.org:/home/torvalds/v2.5/linux
99e5aa34 · Linus Torvalds · 3e27d157 · 820db47a · 99e5aa34 · 99e5aa34
Commit 99e5aa34 authored Aug 31, 2003 by Linus Torvalds
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

drivers/scsi/hosts.h drivers/scsi/hosts.h +0 -1

drivers/scsi/megaraid.c drivers/scsi/megaraid.c +1 -0

No files found.
--- a/drivers/scsi/hosts.h
+++ b/drivers/scsi/hosts.h
@@ -25,7 +25,6 @@
 #define _HOSTS_H

 #include <linux/config.h>
-#include <linux/proc_fs.h>

 #include <scsi/scsi_host.h>


--- a/drivers/scsi/megaraid.c
+++ b/drivers/scsi/megaraid.c
@@ -36,6 +36,7 @@
 #include <asm/uaccess.h>
 #include <asm/io.h>
 #include <linux/delay.h>
+#include <linux/proc_fs.h>
 #include <linux/reboot.h>
 #include <linux/module.h>
 #include <linux/list.h>