From aa4d4d3b16424ac0a6f1869c91af8b44f855ad9c Mon Sep 17 00:00:00 2001 From: "David E. O'Brien" Date: Wed, 15 Nov 2000 21:36:39 +0000 Subject: [PATCH] Sync with sys/i386/conf/GENERIC rev 1.291. Remove `pmtimer' from the MFSROOT kernel as `apm' is already removed. `pmtimer' also removed from the Alpha kernel incase it ever winds up there. (could it ever?) --- release/alpha/dokern.sh | 3 +++ release/amd64/dokern.sh | 3 +++ release/i386/dokern.sh | 3 +++ release/pc98/dokern.sh | 3 +++ release/scripts/dokern.sh | 3 +++ 5 files changed, 15 insertions(+) diff --git a/release/alpha/dokern.sh b/release/alpha/dokern.sh index f0515e2bafa7..657ba9aab311 100755 --- a/release/alpha/dokern.sh +++ b/release/alpha/dokern.sh @@ -41,6 +41,7 @@ sed -e '/ pci$/d' \ -e '/pty/d' \ -e '/pass/d' \ -e '/ apm/d' \ + -e '/pmtimer/d' \ -e '/ppp/d' \ -e '/gif/d' \ -e '/faith/d' \ @@ -68,6 +69,7 @@ else sed -e '/pty/d' \ -e '/pass/d' \ -e '/ apm/d' \ + -e '/pmtimer/d' \ -e '/ppp/d' \ -e '/gif/d' \ -e '/faith/d' \ @@ -107,6 +109,7 @@ elif [ "${ARCH}" = "alpha" ]; then sed -e '/pty/d' \ -e '/pass/d' \ -e '/ apm/d' \ + -e '/pmtimer/d' \ -e '/ppp/d' \ -e '/gif/d' \ -e '/faith/d' \ diff --git a/release/amd64/dokern.sh b/release/amd64/dokern.sh index f0515e2bafa7..657ba9aab311 100755 --- a/release/amd64/dokern.sh +++ b/release/amd64/dokern.sh @@ -41,6 +41,7 @@ sed -e '/ pci$/d' \ -e '/pty/d' \ -e '/pass/d' \ -e '/ apm/d' \ + -e '/pmtimer/d' \ -e '/ppp/d' \ -e '/gif/d' \ -e '/faith/d' \ @@ -68,6 +69,7 @@ else sed -e '/pty/d' \ -e '/pass/d' \ -e '/ apm/d' \ + -e '/pmtimer/d' \ -e '/ppp/d' \ -e '/gif/d' \ -e '/faith/d' \ @@ -107,6 +109,7 @@ elif [ "${ARCH}" = "alpha" ]; then sed -e '/pty/d' \ -e '/pass/d' \ -e '/ apm/d' \ + -e '/pmtimer/d' \ -e '/ppp/d' \ -e '/gif/d' \ -e '/faith/d' \ diff --git a/release/i386/dokern.sh b/release/i386/dokern.sh index f0515e2bafa7..657ba9aab311 100755 --- a/release/i386/dokern.sh +++ b/release/i386/dokern.sh @@ -41,6 +41,7 @@ sed -e '/ pci$/d' \ -e '/pty/d' \ -e '/pass/d' \ -e '/ apm/d' \ + -e '/pmtimer/d' \ -e '/ppp/d' \ -e '/gif/d' \ -e '/faith/d' \ @@ -68,6 +69,7 @@ else sed -e '/pty/d' \ -e '/pass/d' \ -e '/ apm/d' \ + -e '/pmtimer/d' \ -e '/ppp/d' \ -e '/gif/d' \ -e '/faith/d' \ @@ -107,6 +109,7 @@ elif [ "${ARCH}" = "alpha" ]; then sed -e '/pty/d' \ -e '/pass/d' \ -e '/ apm/d' \ + -e '/pmtimer/d' \ -e '/ppp/d' \ -e '/gif/d' \ -e '/faith/d' \ diff --git a/release/pc98/dokern.sh b/release/pc98/dokern.sh index f0515e2bafa7..657ba9aab311 100755 --- a/release/pc98/dokern.sh +++ b/release/pc98/dokern.sh @@ -41,6 +41,7 @@ sed -e '/ pci$/d' \ -e '/pty/d' \ -e '/pass/d' \ -e '/ apm/d' \ + -e '/pmtimer/d' \ -e '/ppp/d' \ -e '/gif/d' \ -e '/faith/d' \ @@ -68,6 +69,7 @@ else sed -e '/pty/d' \ -e '/pass/d' \ -e '/ apm/d' \ + -e '/pmtimer/d' \ -e '/ppp/d' \ -e '/gif/d' \ -e '/faith/d' \ @@ -107,6 +109,7 @@ elif [ "${ARCH}" = "alpha" ]; then sed -e '/pty/d' \ -e '/pass/d' \ -e '/ apm/d' \ + -e '/pmtimer/d' \ -e '/ppp/d' \ -e '/gif/d' \ -e '/faith/d' \ diff --git a/release/scripts/dokern.sh b/release/scripts/dokern.sh index f0515e2bafa7..657ba9aab311 100755 --- a/release/scripts/dokern.sh +++ b/release/scripts/dokern.sh @@ -41,6 +41,7 @@ sed -e '/ pci$/d' \ -e '/pty/d' \ -e '/pass/d' \ -e '/ apm/d' \ + -e '/pmtimer/d' \ -e '/ppp/d' \ -e '/gif/d' \ -e '/faith/d' \ @@ -68,6 +69,7 @@ else sed -e '/pty/d' \ -e '/pass/d' \ -e '/ apm/d' \ + -e '/pmtimer/d' \ -e '/ppp/d' \ -e '/gif/d' \ -e '/faith/d' \ @@ -107,6 +109,7 @@ elif [ "${ARCH}" = "alpha" ]; then sed -e '/pty/d' \ -e '/pass/d' \ -e '/ apm/d' \ + -e '/pmtimer/d' \ -e '/ppp/d' \ -e '/gif/d' \ -e '/faith/d' \