diff options
| author | David E. O'Brien <obrien@FreeBSD.org> | 2000-11-15 21:36:39 +0000 |
|---|---|---|
| committer | David E. O'Brien <obrien@FreeBSD.org> | 2000-11-15 21:36:39 +0000 |
| commit | aa4d4d3b16424ac0a6f1869c91af8b44f855ad9c (patch) | |
| tree | 00f809ba4024bb005997d3ae0eb978b912c25708 | |
| parent | 04f9b2d551cea07e9c89f174dcdc6a382afb0dc7 (diff) | |
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?)
Notes
Notes:
svn path=/head/; revision=68781
| -rwxr-xr-x | release/alpha/dokern.sh | 3 | ||||
| -rwxr-xr-x | release/amd64/dokern.sh | 3 | ||||
| -rwxr-xr-x | release/i386/dokern.sh | 3 | ||||
| -rwxr-xr-x | release/pc98/dokern.sh | 3 | ||||
| -rwxr-xr-x | release/scripts/dokern.sh | 3 |
5 files changed, 15 insertions, 0 deletions
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' \ |