diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-10 14:50:51 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-10 14:50:51 -0400 |
| commit | fc0b60f1dc311a2f7443ce46305edd287b2d8947 (patch) | |
| tree | ffe830c647bd7659c613c2429453e7da787910df /net/ax25/Kconfig | |
| parent | e9910846fdb19f7c5810cbe4c95e4ca6dab6a00f (diff) | |
| parent | 906fc9e92f0e8b618d4025c3aa6289415ecd8152 (diff) | |
Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6
* 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6:
[S390] update default configuration.
[S390] Kconfig: no wireless on s390.
[S390] Kconfig: use common Kconfig files for s390.
[S390] Kconfig: common config options for s390.
[S390] Kconfig: unwanted menus for s390.
[S390] Kconfig: menus with depends on HAS_IOMEM.
[S390] Kconfig: refine depends statements.
[S390] Avoid compile warning.
[S390] qdio: re-add lost perf_stats.tl_runs change in qdio_handle_pci
[S390] Avoid sparse warnings.
[S390] dasd: Fix modular build.
[S390] monreader inlining cleanup.
[S390] cio: Make some structures and a function static.
[S390] cio: Get rid of _ccw_device_get_device_number().
[S390] fix subsystem removal fallout
Diffstat (limited to 'net/ax25/Kconfig')
| -rw-r--r-- | net/ax25/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ax25/Kconfig b/net/ax25/Kconfig index 43dd86fca4d3..2a72aa96a568 100644 --- a/net/ax25/Kconfig +++ b/net/ax25/Kconfig | |||
| @@ -3,7 +3,7 @@ | |||
| 3 | # | 3 | # |
| 4 | 4 | ||
| 5 | menuconfig HAMRADIO | 5 | menuconfig HAMRADIO |
| 6 | depends on NET | 6 | depends on NET && !S390 |
| 7 | bool "Amateur Radio support" | 7 | bool "Amateur Radio support" |
| 8 | help | 8 | help |
| 9 | If you want to connect your Linux box to an amateur radio, answer Y | 9 | If you want to connect your Linux box to an amateur radio, answer Y |