summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
Diffstat (limited to 'tools')
-rw-r--r--tools/Makefile2
-rw-r--r--tools/serial_probe/serial.c8
2 files changed, 1 insertions, 9 deletions
diff --git a/tools/Makefile b/tools/Makefile
index 1d9d5d736..c563a03f7 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -1,7 +1,7 @@
DIRS = serial_probe
CFLAGS = -Wall
-ARCH := $(shell arch | egrep "(x86_64|sparc64|s390x)")
+ARCH := $(shell arch | egrep "x86_64")
ifneq ("x$(ARCH)", "x")
LIB_NAME = lib64
else
diff --git a/tools/serial_probe/serial.c b/tools/serial_probe/serial.c
index c84cbcff5..eb9d1f1cf 100644
--- a/tools/serial_probe/serial.c
+++ b/tools/serial_probe/serial.c
@@ -918,19 +918,11 @@ struct device *serialProbe(enum deviceClass probeClass, int probeFlags,
maj = major(sb.st_rdev);
if (maj != 4 && (maj < 136 || maj > 143)) {
if (ioctl (fd, TIOCLINUX, &twelve) < 0) {
- #ifdef __powerpc__
- // we could have gotten an error for another reason - like EINVAL
- // skipping ttyS0 on PPC - which is where most modems reside
- if (errno == ENOTTY) {
- #endif
if (ioctl (fd, TIOCGSERIAL, &si) >= 0) {
if (si.line > 0) {
console = 1 << si.line;
} else {
console = 0;
- #ifdef __powerpc__
- }
- #endif
}
} else console = 0;
}