summaryrefslogtreecommitdiffstats
path: root/drivers/staging/vt6655/device_main.c
diff options
context:
space:
mode:
authorJim Lieb <lieb@canonical.com>2009-08-12 14:54:12 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2009-09-15 12:02:08 -0700
commit1e5743ca6c91cf345f72b012ae362b88db115bcc (patch)
tree9d5313861ad350c66e0641a76c3d042db767cb3f /drivers/staging/vt6655/device_main.c
parent3e362598fd3c7b8729afd0383a4cdf08849b020e (diff)
downloadop-kernel-dev-1e5743ca6c91cf345f72b012ae362b88db115bcc.zip
op-kernel-dev-1e5743ca6c91cf345f72b012ae362b88db115bcc.tar.gz
Staging: vt665x: remove tpci.h file
Convert pci register/command defs to use kernel definitions. Remove tpci.h. Signed-off-by: Jim Lieb <lieb@canonical.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/vt6655/device_main.c')
-rw-r--r--drivers/staging/vt6655/device_main.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/staging/vt6655/device_main.c b/drivers/staging/vt6655/device_main.c
index b8788a3..545cf42 100644
--- a/drivers/staging/vt6655/device_main.c
+++ b/drivers/staging/vt6655/device_main.c
@@ -1180,17 +1180,17 @@ static BOOL device_get_pci_info(PSDevice pDevice, struct pci_dev* pcid) {
pDevice->pcid = pcid;
- pci_read_config_byte(pcid, PCI_REG_COMMAND, &b);
- pci_write_config_byte(pcid, PCI_REG_COMMAND, (b|COMMAND_BUSM));
+ pci_read_config_byte(pcid, PCI_COMMAND, &b);
+ pci_write_config_byte(pcid, PCI_COMMAND, (b|PCI_COMMAND_MASTER));
#ifdef PLICE_DEBUG
- //pci_read_config_word(pcid,PCI_REG_MAX_LAT,&max_lat);
+ //pci_read_config_word(pcid,PCI_MAX_LAT,&max_lat);
//printk("max lat is %x,SubSystemID is %x\n",max_lat,pDevice->SubSystemID);
//for (ii=0;ii<0xFF;ii++)
- //pci_read_config_word(pcid,PCI_REG_MAX_LAT,&max_lat);
+ //pci_read_config_word(pcid,PCI_MAX_LAT,&max_lat);
//max_lat = 0x20;
- //pci_write_config_word(pcid,PCI_REG_MAX_LAT,max_lat);
- //pci_read_config_word(pcid,PCI_REG_MAX_LAT,&max_lat);
+ //pci_write_config_word(pcid,PCI_MAX_LAT,max_lat);
+ //pci_read_config_word(pcid,PCI_MAX_LAT,&max_lat);
//printk("max lat is %x\n",max_lat);
for (ii=0;ii<0xFF;ii++)
OpenPOWER on IntegriCloud