diff options
| author | Jens Axboe <jens.axboe@oracle.com> | 2009-10-05 09:30:10 +0200 |
|---|---|---|
| committer | Jens Axboe <jens.axboe@oracle.com> | 2009-10-05 09:30:10 +0200 |
| commit | 5d13379a4dba717fb75b749acc0f928c2c02db17 (patch) | |
| tree | ab5bf870206e6ea8e744390cdb37cb14f7e78257 /drivers/net/qlge/qlge.h | |
| parent | 08dc8726d4be85bca793141c827574fd32a681bb (diff) | |
| parent | 374576a8b6f865022c0fd1ca62396889b23d66dd (diff) | |
| download | kernel_samsung_smdk4412-5d13379a4dba717fb75b749acc0f928c2c02db17.zip kernel_samsung_smdk4412-5d13379a4dba717fb75b749acc0f928c2c02db17.tar.gz kernel_samsung_smdk4412-5d13379a4dba717fb75b749acc0f928c2c02db17.tar.bz2 | |
Merge branch 'master' into for-2.6.33
Diffstat (limited to 'drivers/net/qlge/qlge.h')
| -rw-r--r-- | drivers/net/qlge/qlge.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/net/qlge/qlge.h b/drivers/net/qlge/qlge.h index a9845a2..30d5585 100644 --- a/drivers/net/qlge/qlge.h +++ b/drivers/net/qlge/qlge.h @@ -1381,15 +1381,15 @@ struct intr_context { /* adapter flags definitions. */ enum { - QL_ADAPTER_UP = (1 << 0), /* Adapter has been brought up. */ - QL_LEGACY_ENABLED = (1 << 3), - QL_MSI_ENABLED = (1 << 3), - QL_MSIX_ENABLED = (1 << 4), - QL_DMA64 = (1 << 5), - QL_PROMISCUOUS = (1 << 6), - QL_ALLMULTI = (1 << 7), - QL_PORT_CFG = (1 << 8), - QL_CAM_RT_SET = (1 << 9), + QL_ADAPTER_UP = 0, /* Adapter has been brought up. */ + QL_LEGACY_ENABLED = 1, + QL_MSI_ENABLED = 2, + QL_MSIX_ENABLED = 3, + QL_DMA64 = 4, + QL_PROMISCUOUS = 5, + QL_ALLMULTI = 6, + QL_PORT_CFG = 7, + QL_CAM_RT_SET = 8, }; /* link_status bit definitions */ |