diff options
author | Borislav Petkov <bbpetkov@yahoo.de> | 2007-10-18 06:05:06 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-18 17:37:21 -0400 |
commit | 34c6538413e5648b63cb785add509f500b3a7b11 (patch) | |
tree | 3f2e1c4fe134fa123bf5047a640dee425be0a098 /drivers/net/netxen | |
parent | 2c6221483169ddd4c04797cd7296ed4fe52fcdd7 (diff) |
unify DMA_..BIT_MASK definitions: v3.1
Remove redundant DMA_..BIT_MASK definitions across two drivers. The
computation of the majority of the bitmasks is done by the compiler. The
initial split of the patch touching each a different file got removed due
to possible git bisect breakage.
Signed-off-by: Borislav Petkov <bbpetkov@yahoo.de>
Cc: Jeremy Fitzhardinge <jeremy@goop.org>
Cc: Muli Ben-Yehuda <muli@il.ibm.com>
Cc: Jeff Garzik <jeff@garzik.org>
Cc: James Bottomley <James.Bottomley@steeleye.com>
Reviewed-by: Satyam Sharma <satyam@infradead.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/net/netxen')
-rw-r--r-- | drivers/net/netxen/netxen_nic_main.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/net/netxen/netxen_nic_main.c b/drivers/net/netxen/netxen_nic_main.c index 2a1d6d7ec351..601051c584e8 100644 --- a/drivers/net/netxen/netxen_nic_main.c +++ b/drivers/net/netxen/netxen_nic_main.c | |||
@@ -53,9 +53,6 @@ static char netxen_nic_driver_string[] = "NetXen Network Driver version " | |||
53 | #define NETXEN_ADAPTER_UP_MAGIC 777 | 53 | #define NETXEN_ADAPTER_UP_MAGIC 777 |
54 | #define NETXEN_NIC_PEG_TUNE 0 | 54 | #define NETXEN_NIC_PEG_TUNE 0 |
55 | 55 | ||
56 | #define DMA_32BIT_MASK 0x00000000ffffffffULL | ||
57 | #define DMA_35BIT_MASK 0x00000007ffffffffULL | ||
58 | |||
59 | /* Local functions to NetXen NIC driver */ | 56 | /* Local functions to NetXen NIC driver */ |
60 | static int __devinit netxen_nic_probe(struct pci_dev *pdev, | 57 | static int __devinit netxen_nic_probe(struct pci_dev *pdev, |
61 | const struct pci_device_id *ent); | 58 | const struct pci_device_id *ent); |