diff options
| author | Jeff Garzik <jeff@garzik.org> | 2007-11-23 21:49:27 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-01-28 18:04:03 -0500 |
| commit | 092427be8cef341c957a93ec2469890501a09bff (patch) | |
| tree | d4f9e7c9860212bdd76f844d681055d5303b6bff /include/linux/pci_ids.h | |
| parent | 4790654c71b250018ecc234f6b9f1ed96a55572d (diff) | |
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/pci_ids.h')
| -rw-r--r-- | include/linux/pci_ids.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index f162d9c1226c..1280b0c726ea 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h | |||
| @@ -2110,6 +2110,9 @@ | |||
| 2110 | #define PCI_DEVICE_ID_HERC_WIN 0x5732 | 2110 | #define PCI_DEVICE_ID_HERC_WIN 0x5732 |
| 2111 | #define PCI_DEVICE_ID_HERC_UNI 0x5832 | 2111 | #define PCI_DEVICE_ID_HERC_UNI 0x5832 |
| 2112 | 2112 | ||
| 2113 | #define PCI_VENDOR_ID_RDC 0x17f3 | ||
| 2114 | #define PCI_DEVICE_ID_RDC_R6040 0x6040 | ||
| 2115 | |||
| 2113 | #define PCI_VENDOR_ID_SITECOM 0x182d | 2116 | #define PCI_VENDOR_ID_SITECOM 0x182d |
| 2114 | #define PCI_DEVICE_ID_SITECOM_DC105V2 0x3069 | 2117 | #define PCI_DEVICE_ID_SITECOM_DC105V2 0x3069 |
| 2115 | 2118 | ||