git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'upstream'
[pandora-kernel.git]
/
drivers
/
scsi
/
sata_via.c
diff --git
a/drivers/scsi/sata_via.c
b/drivers/scsi/sata_via.c
index
b3ecdbe
..
c762156
100644
(file)
--- a/
drivers/scsi/sata_via.c
+++ b/
drivers/scsi/sata_via.c
@@
-42,7
+42,6
@@
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <linux/device.h>
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <linux/device.h>
-#include "scsi.h"
#include <scsi/scsi_host.h>
#include <linux/libata.h>
#include <asm/io.h>
#include <scsi/scsi_host.h>
#include <linux/libata.h>
#include <asm/io.h>
@@
-76,7
+75,7
@@
static int svia_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
static u32 svia_scr_read (struct ata_port *ap, unsigned int sc_reg);
static void svia_scr_write (struct ata_port *ap, unsigned int sc_reg, u32 val);
static u32 svia_scr_read (struct ata_port *ap, unsigned int sc_reg);
static void svia_scr_write (struct ata_port *ap, unsigned int sc_reg, u32 val);
-static struct pci_device_id svia_pci_tbl[] = {
+static
const
struct pci_device_id svia_pci_tbl[] = {
{ 0x1106, 0x3149, PCI_ANY_ID, PCI_ANY_ID, 0, 0, vt6420 },
{ 0x1106, 0x3249, PCI_ANY_ID, PCI_ANY_ID, 0, 0, vt6421 },
{ 0x1106, 0x3149, PCI_ANY_ID, PCI_ANY_ID, 0, 0, vt6420 },
{ 0x1106, 0x3249, PCI_ANY_ID, PCI_ANY_ID, 0, 0, vt6421 },
@@
-90,7
+89,7
@@
static struct pci_driver svia_pci_driver = {
.remove = ata_pci_remove_one,
};
.remove = ata_pci_remove_one,
};
-static
Scsi_Host_T
emplate svia_sht = {
+static
struct scsi_host_t
emplate svia_sht = {
.module = THIS_MODULE,
.name = DRV_NAME,
.ioctl = ata_scsi_ioctl,
.module = THIS_MODULE,
.name = DRV_NAME,
.ioctl = ata_scsi_ioctl,