summaryrefslogtreecommitdiffstats
path: root/release/amd64
diff options
context:
space:
mode:
authorobrien <obrien@FreeBSD.org>2000-11-15 21:36:39 +0000
committerobrien <obrien@FreeBSD.org>2000-11-15 21:36:39 +0000
commit095aec6ca6a61b29894507dbd4196f8d977d3611 (patch)
tree2930adcb4f2624c9370def88a48cf7dac6df6730 /release/amd64
parent2d220ac7a0870306aa8af4ea891b637d206bc313 (diff)
downloadFreeBSD-src-095aec6ca6a61b29894507dbd4196f8d977d3611.zip
FreeBSD-src-095aec6ca6a61b29894507dbd4196f8d977d3611.tar.gz
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?)
Diffstat (limited to 'release/amd64')
-rwxr-xr-xrelease/amd64/dokern.sh3
1 files changed, 3 insertions, 0 deletions
diff --git a/release/amd64/dokern.sh b/release/amd64/dokern.sh
index f0515e2..657ba9a 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' \
OpenPOWER on IntegriCloud