summaryrefslogtreecommitdiff
path: root/drivers/char
diff options
context:
space:
mode:
authorGeert Uytterhoeven <geert@linux-m68k.org>2016-04-11 10:40:55 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-04-21 09:30:06 +0200
commit0a6aa0d1cf27e9ca7b309cc86aa6b100754f88a4 (patch)
treea562ed7dc20a2f818d6f00ab162a0fe5371d9dba /drivers/char
parent7fe57118a7c002c59e4087806f8f5a9f4a0b037f (diff)
char: Drop bogus dependency of DEVPORT on !M68K
commit 309124e2648d668a0c23539c5078815660a4a850 upstream. 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>
Diffstat (limited to 'drivers/char')
-rw-r--r--drivers/char/Kconfig1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
index a043107da2af..b130d38cf55c 100644
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@ -584,7 +584,6 @@ config TELCLOCK
config DEVPORT
bool
- depends on !M68K
depends on ISA || PCI
default y