diff options
| author | Finn Thain <fthain@telegraphics.com.au> | 2014-03-18 04:42:23 +0400 |
|---|---|---|
| committer | Christoph Hellwig <hch@lst.de> | 2014-05-28 14:11:33 +0400 |
| commit | 9f6620a318e87d73f8ce3daa7f84efc739d1fa2d (patch) | |
| tree | 066aec1daa60668df713f0f489f13799d2658457 | |
| parent | a469dc2765dca3c07ae356b21e0cd95178249251 (diff) | |
| download | linux-9f6620a318e87d73f8ce3daa7f84efc739d1fa2d.tar.xz | |
scsi/NCR5380: reduce depth of sun3_scsi nested includes
Move the #include "NCR5380.h" out of the sun3_scsi.h header file and into
the driver .c files, like all the other NCR5380 drivers in the tree.
This improves uniformity and reduces the depth of nested includes. The
sequence of #include's, #define's and #if's no longer does my head in.
Signed-off-by: Finn Thain <fthain@telegraphics.com.au>
Acked-by: Sam Creasey <sammy@sammy.net>
Signed-off-by: Christoph Hellwig <hch@lst.de>
| -rw-r--r-- | drivers/scsi/sun3_scsi.c | 1 | ||||
| -rw-r--r-- | drivers/scsi/sun3_scsi.h | 8 | ||||
| -rw-r--r-- | drivers/scsi/sun3_scsi_vme.c | 1 |
3 files changed, 5 insertions, 5 deletions
diff --git a/drivers/scsi/sun3_scsi.c b/drivers/scsi/sun3_scsi.c index 99466e64e507..ac9c29b55a33 100644 --- a/drivers/scsi/sun3_scsi.c +++ b/drivers/scsi/sun3_scsi.c @@ -71,6 +71,7 @@ #include "scsi.h" #include <scsi/scsi_host.h> #include "sun3_scsi.h" +#include "NCR5380.h" /* #define OLDDMA */ diff --git a/drivers/scsi/sun3_scsi.h b/drivers/scsi/sun3_scsi.h index 5d2ca648657f..e96a37cf06ac 100644 --- a/drivers/scsi/sun3_scsi.h +++ b/drivers/scsi/sun3_scsi.h @@ -29,8 +29,8 @@ * 1+ (800) 334-5454 */ -#ifndef SUN3_NCR5380_H -#define SUN3_NCR5380_H +#ifndef SUN3_SCSI_H +#define SUN3_SCSI_H #define SUN3SCSI_PUBLIC_RELEASE 1 @@ -182,7 +182,5 @@ struct sun3_udc_regs { #define VME_DATA24 0x3d00 -#include "NCR5380.h" - -#endif /* SUN3_NCR5380_H */ +#endif /* SUN3_SCSI_H */ diff --git a/drivers/scsi/sun3_scsi_vme.c b/drivers/scsi/sun3_scsi_vme.c index 95031d571cd0..9e7974b56f12 100644 --- a/drivers/scsi/sun3_scsi_vme.c +++ b/drivers/scsi/sun3_scsi_vme.c @@ -42,6 +42,7 @@ #include "initio.h" #include <scsi/scsi_host.h> #include "sun3_scsi.h" +#include "NCR5380.h" extern int sun3_map_test(unsigned long, char *); |