diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-11-16 05:33:41 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-11-16 05:33:41 -0500 |
| commit | fe705ab1526bc2c8b7756f3a855f040ab2060af2 (patch) | |
| tree | c4444d19983c5578f9ef2bddc1fa01b6e42f91a3 /drivers/net/qlge/qlge.h | |
| parent | 7d1794e81b5f202c73d7e3e65f0ee7aae4928038 (diff) | |
| parent | ad1cd745060ae2f24026b3b3d09da3426df6ab36 (diff) | |
Merge branch 'topic/beep-rename' into topic/hda
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 a9845a2f243f..30d5585beeee 100644 --- a/drivers/net/qlge/qlge.h +++ b/drivers/net/qlge/qlge.h | |||
| @@ -1381,15 +1381,15 @@ struct intr_context { | |||
| 1381 | 1381 | ||
| 1382 | /* adapter flags definitions. */ | 1382 | /* adapter flags definitions. */ |
| 1383 | enum { | 1383 | enum { |
| 1384 | QL_ADAPTER_UP = (1 << 0), /* Adapter has been brought up. */ | 1384 | QL_ADAPTER_UP = 0, /* Adapter has been brought up. */ |
| 1385 | QL_LEGACY_ENABLED = (1 << 3), | 1385 | QL_LEGACY_ENABLED = 1, |
| 1386 | QL_MSI_ENABLED = (1 << 3), | 1386 | QL_MSI_ENABLED = 2, |
| 1387 | QL_MSIX_ENABLED = (1 << 4), | 1387 | QL_MSIX_ENABLED = 3, |
| 1388 | QL_DMA64 = (1 << 5), | 1388 | QL_DMA64 = 4, |
| 1389 | QL_PROMISCUOUS = (1 << 6), | 1389 | QL_PROMISCUOUS = 5, |
| 1390 | QL_ALLMULTI = (1 << 7), | 1390 | QL_ALLMULTI = 6, |
| 1391 | QL_PORT_CFG = (1 << 8), | 1391 | QL_PORT_CFG = 7, |
| 1392 | QL_CAM_RT_SET = (1 << 9), | 1392 | QL_CAM_RT_SET = 8, |
| 1393 | }; | 1393 | }; |
| 1394 | 1394 | ||
| 1395 | /* link_status bit definitions */ | 1395 | /* link_status bit definitions */ |