diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-04-08 04:35:30 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-04-08 04:35:30 -0400 |
| commit | 5ea472a77f8e4811ceee3f44a9deda6ad6e8b789 (patch) | |
| tree | a9ec5019e2b666a19874fc344ffb0dd5da6bce94 /drivers/net/Kconfig | |
| parent | 6c009ecef8cca28c7c09eb16d0802e37915a76e1 (diff) | |
| parent | 577c9c456f0e1371cbade38eaf91ae8e8a308555 (diff) | |
Merge commit 'v2.6.30-rc1' into perfcounters/core
Conflicts:
arch/powerpc/include/asm/systbl.h
arch/powerpc/include/asm/unistd.h
include/linux/init_task.h
Merge reason: the conflicts are non-trivial: PowerPC placement
of sys_perf_counter_open has to be mixed with the
new preadv/pwrite syscalls.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/net/Kconfig')
| -rw-r--r-- | drivers/net/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index 16899eee397e..9e7baec45720 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig | |||
| @@ -2234,7 +2234,7 @@ config BNX2 | |||
| 2234 | tristate "Broadcom NetXtremeII support" | 2234 | tristate "Broadcom NetXtremeII support" |
| 2235 | depends on PCI | 2235 | depends on PCI |
| 2236 | select CRC32 | 2236 | select CRC32 |
| 2237 | select ZLIB_INFLATE | 2237 | select FW_LOADER |
| 2238 | help | 2238 | help |
| 2239 | This driver supports Broadcom NetXtremeII gigabit Ethernet cards. | 2239 | This driver supports Broadcom NetXtremeII gigabit Ethernet cards. |
| 2240 | 2240 | ||