diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-28 13:51:43 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-28 13:51:43 -0400 |
| commit | e31a94ed371c70855eb30b77c490d6d85dd4da26 (patch) | |
| tree | 58d9f1a75a22319f97731db8d9ac07b78a8d8aaf /drivers/net | |
| parent | 9d9ad4b51d2b29b5bbeb4011f5e76f7538119cf9 (diff) | |
| parent | fcbd3b4b92efe29b59df16b910138cf43683be88 (diff) | |
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus: (45 commits)
[MIPS] Pb1200/DBAu1200: move platform code to its proper place
[MIPS] Fix handling of trap and breakpoint instructions
[MIPS] Pb1200: do register SMC 91C111
[MIPS] DBAu1200: fix bad SMC 91C111 resource size
[NET] Kconfig: Rename MIKROTIK_RB500 -> MIKROTIK_RB532
[MIPS] IP27: Fix build bug due to missing include
[MIPS] Fix some sparse warnings on traps.c and irq-msc01.c
[MIPS] cevt-gt641xx: Kill unnecessary include
[MIPS] DS1287: Add clockevent driver
[MIPS] add DECstation I/O ASIC clocksource
[MIPS] rbtx4938: minor cleanup
[MIPS] Alchemy: kill unused PCI_IRQ_TABLE_LOOKUP macro
[MIPS] rbtx4938: misc cleanups
[MIPS] jmr3927: use generic txx9 gpio
[MIPS] rbhma4500: use generic txx9 gpio
[MIPS] generic txx9 gpio support
[MIPS] make fallback gpio.h gpiolib-friendly
[MIPS] unexport null_perf_irq() and make it static
[MIPS] unexport rtc_mips_set_time()
[MIPS] unexport copy_from_user_page()
...
Diffstat (limited to 'drivers/net')
| -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 8082c1d142df..f90a86ba7e2f 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig | |||
| @@ -469,7 +469,7 @@ config SNI_82596 | |||
| 469 | 469 | ||
| 470 | config KORINA | 470 | config KORINA |
| 471 | tristate "Korina (IDT RC32434) Ethernet support" | 471 | tristate "Korina (IDT RC32434) Ethernet support" |
| 472 | depends on NET_ETHERNET && MIKROTIK_RB500 | 472 | depends on NET_ETHERNET && MIKROTIK_RB532 |
| 473 | help | 473 | help |
| 474 | If you have a Mikrotik RouterBoard 500 or IDT RC32434 | 474 | If you have a Mikrotik RouterBoard 500 or IDT RC32434 |
| 475 | based system say Y. Otherwise say N. | 475 | based system say Y. Otherwise say N. |