diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-03-08 15:21:04 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-03-08 15:21:04 -0500 |
| commit | 988addf82e4c03739375279de73929580a2d4a6a (patch) | |
| tree | 989ae1cd4e264bbad80c65f04480486246e7b9f3 /drivers/net/bnx2x_fw_defs.h | |
| parent | 004c1c7096659d352b83047a7593e91d8a30e3c5 (diff) | |
| parent | 25cf84cf377c0aae5dbcf937ea89bc7893db5176 (diff) | |
Merge branch 'origin' into devel-stable
Conflicts:
arch/arm/mach-mx2/devices.c
arch/arm/mach-mx2/devices.h
sound/soc/pxa/pxa-ssp.c
Diffstat (limited to 'drivers/net/bnx2x_fw_defs.h')
| -rw-r--r-- | drivers/net/bnx2x_fw_defs.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/net/bnx2x_fw_defs.h b/drivers/net/bnx2x_fw_defs.h index 931dcace5628..08d71bf438d6 100644 --- a/drivers/net/bnx2x_fw_defs.h +++ b/drivers/net/bnx2x_fw_defs.h | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | /* bnx2x_fw_defs.h: Broadcom Everest network driver. | 1 | /* bnx2x_fw_defs.h: Broadcom Everest network driver. |
| 2 | * | 2 | * |
| 3 | * Copyright (c) 2007-2009 Broadcom Corporation | 3 | * Copyright (c) 2007-2010 Broadcom Corporation |
| 4 | * | 4 | * |
| 5 | * This program is free software; you can redistribute it and/or modify | 5 | * This program is free software; you can redistribute it and/or modify |
| 6 | * it under the terms of the GNU General Public License as published by | 6 | * it under the terms of the GNU General Public License as published by |
| @@ -471,6 +471,11 @@ | |||
| 471 | 471 | ||
| 472 | 472 | ||
| 473 | /* Host coalescing constants */ | 473 | /* Host coalescing constants */ |
| 474 | #define HC_IGU_BC_MODE 0 | ||
| 475 | #define HC_IGU_NBC_MODE 1 | ||
| 476 | |||
| 477 | #define HC_REGULAR_SEGMENT 0 | ||
| 478 | #define HC_DEFAULT_SEGMENT 1 | ||
| 474 | 479 | ||
| 475 | /* index numbers */ | 480 | /* index numbers */ |
| 476 | #define HC_USTORM_DEF_SB_NUM_INDICES 8 | 481 | #define HC_USTORM_DEF_SB_NUM_INDICES 8 |