diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-06-25 12:27:29 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-06-25 12:27:29 +0200 |
| commit | 5ce001b0e56638c726270d4f9e05d46d4250dfbb (patch) | |
| tree | c21cf007ddef99d5e8b23dde9621bd9152e676a8 /drivers/net/sfc/falcon.h | |
| parent | stackprotector: use canary at end of stack to indicate overruns at oops time (diff) | |
| parent | Linux 2.6.26-rc8 (diff) | |
| download | linux-5ce001b0e56638c726270d4f9e05d46d4250dfbb.tar.xz linux-5ce001b0e56638c726270d4f9e05d46d4250dfbb.zip | |
Merge branch 'linus' into stackprotector
Diffstat (limited to 'drivers/net/sfc/falcon.h')
| -rw-r--r-- | drivers/net/sfc/falcon.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/net/sfc/falcon.h b/drivers/net/sfc/falcon.h index 6117403b0c03..492f9bc28840 100644 --- a/drivers/net/sfc/falcon.h +++ b/drivers/net/sfc/falcon.h @@ -23,7 +23,10 @@ enum falcon_revision { FALCON_REV_B0 = 2, }; -#define FALCON_REV(efx) ((efx)->pci_dev->revision) +static inline int falcon_rev(struct efx_nic *efx) +{ + return efx->pci_dev->revision; +} extern struct efx_nic_type falcon_a_nic_type; extern struct efx_nic_type falcon_b_nic_type; |