diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-04-08 11:25:42 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-04-08 11:26:00 -0400 |
| commit | 5af8c4e0fac9838428bd718040b664043a05f37c (patch) | |
| tree | 75a01d98ed244db45fe3c734c4a81c1a3d92ac37 /net/dsa/Kconfig | |
| parent | 46e0bb9c12f4bab539736f1714cbf16600f681ec (diff) | |
| parent | 577c9c456f0e1371cbade38eaf91ae8e8a308555 (diff) | |
Merge commit 'v2.6.30-rc1' into sched/urgent
Merge reason: update to latest upstream to queue up fix
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'net/dsa/Kconfig')
| -rw-r--r-- | net/dsa/Kconfig | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/dsa/Kconfig b/net/dsa/Kconfig index 49211b35725b..c51b55400dc5 100644 --- a/net/dsa/Kconfig +++ b/net/dsa/Kconfig | |||
| @@ -41,13 +41,13 @@ config NET_DSA_MV88E6XXX_NEED_PPU | |||
| 41 | default n | 41 | default n |
| 42 | 42 | ||
| 43 | config NET_DSA_MV88E6131 | 43 | config NET_DSA_MV88E6131 |
| 44 | bool "Marvell 88E6131 ethernet switch chip support" | 44 | bool "Marvell 88E6095/6095F/6131 ethernet switch chip support" |
| 45 | select NET_DSA_MV88E6XXX | 45 | select NET_DSA_MV88E6XXX |
| 46 | select NET_DSA_MV88E6XXX_NEED_PPU | 46 | select NET_DSA_MV88E6XXX_NEED_PPU |
| 47 | select NET_DSA_TAG_DSA | 47 | select NET_DSA_TAG_DSA |
| 48 | ---help--- | 48 | ---help--- |
| 49 | This enables support for the Marvell 88E6131 ethernet switch | 49 | This enables support for the Marvell 88E6095/6095F/6131 |
| 50 | chip. | 50 | ethernet switch chips. |
| 51 | 51 | ||
| 52 | config NET_DSA_MV88E6123_61_65 | 52 | config NET_DSA_MV88E6123_61_65 |
| 53 | bool "Marvell 88E6123/6161/6165 ethernet switch chip support" | 53 | bool "Marvell 88E6123/6161/6165 ethernet switch chip support" |