diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-05-10 11:05:24 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-05-10 11:05:45 -0400 |
| commit | 932fed4e2e42c3d730c01bb63b1c4f812c533d5b (patch) | |
| tree | 11b1afac3a40d253cdb905c42901edfaae5e196e /net/dsa/Kconfig | |
| parent | 57d524154ffe99d27fb55e0e30ddbad9f4c35806 (diff) | |
| parent | 693d92a1bbc9e42681c42ed190bd42b636ca876f (diff) | |
Merge commit 'v2.6.39-rc7' into perf/core
Merge reason: pull in the latest fixes.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'net/dsa/Kconfig')
| -rw-r--r-- | net/dsa/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/dsa/Kconfig b/net/dsa/Kconfig index 87bb5f4de0e8..c53ded2a98df 100644 --- a/net/dsa/Kconfig +++ b/net/dsa/Kconfig | |||
| @@ -41,12 +41,12 @@ 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 88E6095/6095F/6131 ethernet switch chip support" | 44 | bool "Marvell 88E6085/6095/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 88E6095/6095F/6131 | 49 | This enables support for the Marvell 88E6085/6095/6095F/6131 |
| 50 | ethernet switch chips. | 50 | ethernet switch chips. |
| 51 | 51 | ||
| 52 | config NET_DSA_MV88E6123_61_65 | 52 | config NET_DSA_MV88E6123_61_65 |