diff options
| author | David S. Miller <davem@davemloft.net> | 2009-11-19 01:19:03 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-11-19 01:19:03 -0500 |
| commit | 3505d1a9fd65e2d3e00827857b6795d9d8983658 (patch) | |
| tree | 941cfafdb57c427bb6b7ebf6354ee93b2a3693b5 /arch/m68k | |
| parent | dfef948ed2ba69cf041840b5e860d6b4e16fa0b1 (diff) | |
| parent | 66b00a7c93ec782d118d2c03bd599cfd041e80a1 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/sfc/sfe4001.c
drivers/net/wireless/libertas/cmd.c
drivers/staging/Kconfig
drivers/staging/Makefile
drivers/staging/rtl8187se/Kconfig
drivers/staging/rtl8192e/Kconfig
Diffstat (limited to 'arch/m68k')
| -rw-r--r-- | arch/m68k/Kconfig | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/m68k/Kconfig b/arch/m68k/Kconfig index 29dd8489ffec..ecdc19a299b2 100644 --- a/arch/m68k/Kconfig +++ b/arch/m68k/Kconfig | |||
| @@ -561,7 +561,7 @@ config HPAPCI | |||
| 561 | 561 | ||
| 562 | config MVME147_SCC | 562 | config MVME147_SCC |
| 563 | bool "SCC support for MVME147 serial ports" | 563 | bool "SCC support for MVME147 serial ports" |
| 564 | depends on MVME147 | 564 | depends on MVME147 && BROKEN |
| 565 | help | 565 | help |
| 566 | This is the driver for the serial ports on the Motorola MVME147 | 566 | This is the driver for the serial ports on the Motorola MVME147 |
| 567 | boards. Everyone using one of these boards should say Y here. | 567 | boards. Everyone using one of these boards should say Y here. |
| @@ -576,14 +576,14 @@ config SERIAL167 | |||
| 576 | 576 | ||
| 577 | config MVME162_SCC | 577 | config MVME162_SCC |
| 578 | bool "SCC support for MVME162 serial ports" | 578 | bool "SCC support for MVME162 serial ports" |
| 579 | depends on MVME16x | 579 | depends on MVME16x && BROKEN |
| 580 | help | 580 | help |
| 581 | This is the driver for the serial ports on the Motorola MVME162 and | 581 | This is the driver for the serial ports on the Motorola MVME162 and |
| 582 | 172 boards. Everyone using one of these boards should say Y here. | 582 | 172 boards. Everyone using one of these boards should say Y here. |
| 583 | 583 | ||
| 584 | config BVME6000_SCC | 584 | config BVME6000_SCC |
| 585 | bool "SCC support for BVME6000 serial ports" | 585 | bool "SCC support for BVME6000 serial ports" |
| 586 | depends on BVME6000 | 586 | depends on BVME6000 && BROKEN |
| 587 | help | 587 | help |
| 588 | This is the driver for the serial ports on the BVME4000 and BVME6000 | 588 | This is the driver for the serial ports on the BVME4000 and BVME6000 |
| 589 | boards from BVM Ltd. Everyone using one of these boards should say | 589 | boards from BVM Ltd. Everyone using one of these boards should say |