diff options
| author | Geert Uytterhoeven <geert@linux-m68k.org> | 2016-04-11 10:40:55 +0200 |
|---|---|---|
| committer | Willy Tarreau <w@1wt.eu> | 2017-06-08 00:47:07 +0200 |
| commit | 6800d881c1d1117cc7cc5cd6e9400aaf3eecfe25 (patch) | |
| tree | 9de9558d398d80c694370d50d4378cfcfbfc48ca /drivers | |
| parent | d5efe5c2f9654572ff9585a24cbcb06749815d30 (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: Jiri Slaby <jslaby@suse.cz>
Signed-off-by: Willy Tarreau <w@1wt.eu>
Diffstat (limited to 'drivers')
| -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 3bb6fa3930be..30878924e65b 100644 --- a/drivers/char/Kconfig +++ b/drivers/char/Kconfig @@ -580,7 +580,6 @@ config TELCLOCK config DEVPORT bool - depends on !M68K depends on ISA || PCI default y |