diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-11-08 19:56:20 -0800 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-11-15 16:41:27 -0600 |
| commit | db3a8815fb03f9985713b4ab29e208b7074f939c (patch) | |
| tree | ecd16112552d0161db7763cc669ba30db0d13bd4 /drivers/scsi/NCR53c406a.c | |
| parent | bf4713418b9d8543e7b64bf6c742f1959828033e (diff) | |
[SCSI] minor bug fixes and cleanups
BusLogic: use kzalloc(), remove cast to/from void*
aic7xxx_old: fix typo in cast
NCR53c406a: ifdef out static built code
fd_mcs: ifdef out static built code
ncr53c8xx: ifdef out static built code
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/scsi/NCR53c406a.c')
| -rw-r--r-- | drivers/scsi/NCR53c406a.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/scsi/NCR53c406a.c b/drivers/scsi/NCR53c406a.c index d4613815f685..8578555d58fd 100644 --- a/drivers/scsi/NCR53c406a.c +++ b/drivers/scsi/NCR53c406a.c @@ -220,9 +220,11 @@ static void *addresses[] = { static unsigned short ports[] = { 0x230, 0x330, 0x280, 0x290, 0x330, 0x340, 0x300, 0x310, 0x348, 0x350 }; #define PORT_COUNT ARRAY_SIZE(ports) +#ifndef MODULE /* possible interrupt channels */ static unsigned short intrs[] = { 10, 11, 12, 15 }; #define INTR_COUNT ARRAY_SIZE(intrs) +#endif /* !MODULE */ /* signatures for NCR 53c406a based controllers */ #if USE_BIOS @@ -605,6 +607,7 @@ static int NCR53c406a_release(struct Scsi_Host *shost) return 0; } +#ifndef MODULE /* called from init/main.c */ static int __init NCR53c406a_setup(char *str) { @@ -661,6 +664,8 @@ static int __init NCR53c406a_setup(char *str) __setup("ncr53c406a=", NCR53c406a_setup); +#endif /* !MODULE */ + static const char *NCR53c406a_info(struct Scsi_Host *SChost) { DEB(printk("NCR53c406a_info called\n")); |