summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2010-08-31 13:12:45 +1000
committerStephen Rothwell <sfr@canb.auug.org.au>2010-08-31 13:12:45 +1000
commit1a669c418d05e06c517d4e511dd5ce31ede3c534 (patch)
tree9bb1601c55bd1d06129f22a16ed69bc5e6756e85
parentb3391604bbe3a4fb40043f803d1668a32c819242 (diff)
Revert "starfire: use BUILD_BUG_ON for netdrv_addr_t"
This reverts commit 56543af9563d91c1c5596a7980b416389bdea071.
-rw-r--r--drivers/net/starfire.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/net/starfire.c b/drivers/net/starfire.c
index c3bf288aaf25..26c363462856 100644
--- a/drivers/net/starfire.c
+++ b/drivers/net/starfire.c
@@ -2078,7 +2078,11 @@ static int __init starfire_init (void)
printk(KERN_INFO DRV_NAME ": polling (NAPI) enabled\n");
#endif
- BUILD_BUG_ON(sizeof(dma_addr_t) != sizeof(netdrv_addr_t));
+ /* we can do this test only at run-time... sigh */
+ if (sizeof(dma_addr_t) != sizeof(netdrv_addr_t)) {
+ printk("This driver has dma_addr_t issues, please send email to maintainer\n");
+ return -ENODEV;
+ }
return pci_register_driver(&starfire_driver);
}