diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-09-27 18:16:47 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-09-27 18:16:47 -0400 |
| commit | 3b9f6cb8a1ec791be79c6c7595fea922f12d1e64 (patch) | |
| tree | 2393a448add846e6c2ed12f68106c3018b72c6a9 /drivers/net/acenic.c | |
| parent | c38778c3a9aeadcd1ee319cfc8ea5a9cbf8cdafa (diff) | |
| parent | a77c64c1a641950626181b4857abb701d8f38ccc (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'drivers/net/acenic.c')
| -rw-r--r-- | drivers/net/acenic.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/net/acenic.c b/drivers/net/acenic.c index a075246f6f43..71a4f60f7325 100644 --- a/drivers/net/acenic.c +++ b/drivers/net/acenic.c | |||
| @@ -163,11 +163,7 @@ MODULE_DEVICE_TABLE(pci, acenic_pci_tbl); | |||
| 163 | #define SET_NETDEV_DEV(net, pdev) do{} while(0) | 163 | #define SET_NETDEV_DEV(net, pdev) do{} while(0) |
| 164 | #endif | 164 | #endif |
| 165 | 165 | ||
| 166 | #if LINUX_VERSION_CODE >= 0x2051c | ||
| 167 | #define ace_sync_irq(irq) synchronize_irq(irq) | 166 | #define ace_sync_irq(irq) synchronize_irq(irq) |
| 168 | #else | ||
| 169 | #define ace_sync_irq(irq) synchronize_irq() | ||
| 170 | #endif | ||
| 171 | 167 | ||
| 172 | #ifndef offset_in_page | 168 | #ifndef offset_in_page |
| 173 | #define offset_in_page(ptr) ((unsigned long)(ptr) & ~PAGE_MASK) | 169 | #define offset_in_page(ptr) ((unsigned long)(ptr) & ~PAGE_MASK) |