summaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2007-11-23 21:49:27 -0500
committerDavid S. Miller <davem@davemloft.net>2008-01-28 15:04:03 -0800
commit092427be8cef341c957a93ec2469890501a09bff (patch)
treed4f9e7c9860212bdd76f844d681055d5303b6bff /include/linux
parent4790654c71b250018ecc234f6b9f1ed96a55572d (diff)
downloadop-kernel-dev-092427be8cef341c957a93ec2469890501a09bff.zip
op-kernel-dev-092427be8cef341c957a93ec2469890501a09bff.tar.gz
drivers/net/r6040: fix obvious problems (but more remain)
- checkpatch fixes - fix bogus and uninitialized return codes in r6040_start_xmit() - netdev_get_settings() fix obvious locking bug flagged by compiler warning - set DMA consistent mask - remove unnecessary setting of dev->base_addr Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/pci_ids.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index f162d9c..1280b0c 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -2110,6 +2110,9 @@
#define PCI_DEVICE_ID_HERC_WIN 0x5732
#define PCI_DEVICE_ID_HERC_UNI 0x5832
+#define PCI_VENDOR_ID_RDC 0x17f3
+#define PCI_DEVICE_ID_RDC_R6040 0x6040
+
#define PCI_VENDOR_ID_SITECOM 0x182d
#define PCI_DEVICE_ID_SITECOM_DC105V2 0x3069
OpenPOWER on IntegriCloud