diff options
| author | Geert Uytterhoeven <geert@linux-m68k.org> | 2016-04-11 10:40:55 +0200 |
|---|---|---|
| committer | Mister Oyster <oysterized@gmail.com> | 2017-04-25 11:28:21 +0200 |
| commit | 87123816bdd6b9a566a7829925c1cac3d9fda834 (patch) | |
| tree | 1a2c311018e0095bc86156d01901ecd66007f8e4 /drivers/char | |
| parent | 20ccd1e3ce3323d66ab29bf71cd75b337b2667a1 (diff) | |
UPSTREAM: char: Drop bogus dependency of DEVPORT on !M68K
(cherry pick from commit 309124e2648d668a0c23539c5078815660a4a850)
According to full-history-linux commit d3794f4fa7c3edc3 ("[PATCH] M68k
update (part 25)"), port operations are allowed on m68k if CONFIG_ISA is
defined.
However, commit 153dcc54df826d2f ("[PATCH] mem driver: fix conditional
on isa i/o support") accidentally changed an "||" into an "&&",
disabling it completely on m68k. This logic was retained when
introducing the DEVPORT symbol in commit 4f911d64e04a44c4 ("Make
/dev/port conditional on config symbol").
Drop the bogus dependency on !M68K to fix this.
Fixes: 153dcc54df826d2f ("[PATCH] mem driver: fix conditional on isa i/o support")
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Tested-by: Al Stone <ahs3@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Bug: 37210310
Bug: 36604779
Change-Id: I9139bd8a5a6e9e39c2e428bde23a7d9be07e2f91
Diffstat (limited to 'drivers/char')
| -rw-r--r-- | drivers/char/Kconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig index ddbed25c7..01aad1185 100644 --- a/drivers/char/Kconfig +++ b/drivers/char/Kconfig @@ -593,7 +593,6 @@ config TELCLOCK config DEVPORT bool - depends on !M68K depends on ISA || PCI default y |