diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-29 16:42:28 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-29 16:42:28 -0400 |
| commit | 55663219378eecd6fccb319be27ce6737a535e4c (patch) | |
| tree | ff20fe50fa2e86ba09677a8b2cc7462ea11347a6 /drivers/net/Kconfig | |
| parent | a43266355b3d8cf6717a27159f9a417bdff73782 (diff) | |
| parent | 58da10bb3fe680a197e83d5eccb5265a721c98e2 (diff) | |
Merge branch 'for_paulus' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc
* 'for_paulus' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc:
[POWERPC] Fix Kconfig warning
[PPC] Fix modpost warning
[POWERPC] Fix modpost warning
[POWERPC] Fix Section mismatch warnings
[POWERPC] QE: fix Kconfig 'select' warning with UCC_FAST
[POWERPC] 52xx: unbreak lite5200 dts (_pic vs. -pic)
[PPC] Remove duplicate export of __div64_32.
[PPC] Fix COMMON symbol warnings
Diffstat (limited to 'drivers/net/Kconfig')
| -rw-r--r-- | drivers/net/Kconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index 30fd479fea5e..1798a9f9fb25 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig | |||
| @@ -2280,7 +2280,6 @@ config GFAR_NAPI | |||
| 2280 | config UCC_GETH | 2280 | config UCC_GETH |
| 2281 | tristate "Freescale QE Gigabit Ethernet" | 2281 | tristate "Freescale QE Gigabit Ethernet" |
| 2282 | depends on QUICC_ENGINE | 2282 | depends on QUICC_ENGINE |
| 2283 | select UCC_FAST | ||
| 2284 | help | 2283 | help |
| 2285 | This driver supports the Gigabit Ethernet mode of the QUICC Engine, | 2284 | This driver supports the Gigabit Ethernet mode of the QUICC Engine, |
| 2286 | which is available on some Freescale SOCs. | 2285 | which is available on some Freescale SOCs. |