Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 68812
b: refs/heads/master
c: 8c6af9e
h: refs/heads/master
v: v3
  • Loading branch information
Matthew Wilcox authored and James Bottomley committed Oct 12, 2007
1 parent b29ab61 commit 8034632
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 25 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: ea312552e94883efc42cfa4651bcf964f3110564
refs/heads/master: 8c6af9e174abdf40c30a4a229bbd11b458869f97
6 changes: 6 additions & 0 deletions trunk/MAINTAINERS
Original file line number Diff line number Diff line change
Expand Up @@ -288,6 +288,12 @@ P: Colin Leroy
M: colin@colino.net
S: Maintained

ADVANSYS SCSI DRIVER
P: Matthew Wilcox
M: matthew@wil.cx
L: linux-scsi@vger.kernel.org
S: Maintained

AEDSP16 DRIVER
P: Riccardo Facchetti
M: fizban@tin.it
Expand Down
43 changes: 19 additions & 24 deletions trunk/drivers/scsi/advansys.c
Original file line number Diff line number Diff line change
@@ -1,20 +1,23 @@
#define ASC_VERSION "3.3K" /* AdvanSys Driver Version */
#define ASC_VERSION "3.4" /* AdvanSys Driver Version */

/*
* advansys.c - Linux Host Driver for AdvanSys SCSI Adapters
*
* Copyright (c) 1995-2000 Advanced System Products, Inc.
* Copyright (c) 2000-2001 ConnectCom Solutions, Inc.
* Copyright (c) 2007 Matthew Wilcox <matthew@wil.cx>
* All Rights Reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that redistributions of source
* code retain the above copyright notice and this comment without
* modification.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*/

/*
* As of March 8, 2000 Advanced System Products, Inc. (AdvanSys)
* changed its name to ConnectCom Solutions, Inc.
*
* On June 18, 2001 Initio Corp. acquired ConnectCom's SCSI assets
*/

/*
Expand Down Expand Up @@ -755,11 +758,6 @@
*/

#include <linux/module.h>

#if defined(CONFIG_X86) && !defined(CONFIG_ISA)
#define CONFIG_ISA
#endif /* CONFIG_X86 && !CONFIG_ISA */

#include <linux/string.h>
#include <linux/kernel.h>
#include <linux/types.h>
Expand All @@ -771,14 +769,20 @@
#include <linux/proc_fs.h>
#include <linux/init.h>
#include <linux/blkdev.h>
#include <linux/stat.h>
#include <linux/pci.h>
#include <linux/spinlock.h>
#include <linux/dma-mapping.h>

#include <asm/io.h>
#include <asm/system.h>
#include <asm/dma.h>

#include <scsi/scsi_cmnd.h>
#include <scsi/scsi_device.h>
#include <scsi/scsi_tcq.h>
#include <scsi/scsi.h>
#include <scsi/scsi_host.h>

/* FIXME: (by jejb@steeleye.com) This warning is present for two
* reasons:
*
Expand All @@ -793,15 +797,6 @@
*/
#warning this driver is still not properly converted to the DMA API

#include <scsi/scsi_cmnd.h>
#include <scsi/scsi_device.h>
#include <scsi/scsi_tcq.h>
#include <scsi/scsi.h>
#include <scsi/scsi_host.h>
#ifdef CONFIG_PCI
#include <linux/pci.h>
#endif /* CONFIG_PCI */

/*
* --- Driver Options
*/
Expand Down Expand Up @@ -17772,8 +17767,6 @@ static void AdvInquiryHandling(ADV_DVC_VAR *asc_dvc, ADV_SCSI_REQ_Q *scsiq)
}
}

MODULE_LICENSE("Dual BSD/GPL");

static struct Scsi_Host *__devinit
advansys_board_found(int iop, struct device *dev, int bus_type)
{
Expand Down Expand Up @@ -19029,3 +19022,5 @@ static struct pci_device_id advansys_pci_tbl[] __devinitdata = {

MODULE_DEVICE_TABLE(pci, advansys_pci_tbl);
#endif /* CONFIG_PCI */

MODULE_LICENSE("GPL");

0 comments on commit 8034632

Please sign in to comment.