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?)
This commit is contained in:
parent
04f9b2d551
commit
aa4d4d3b16
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=68781
@ -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' \
|
||||
|
@ -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' \
|
||||
|
@ -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' \
|
||||
|
@ -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' \
|
||||
|
@ -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' \
|
||||
|
Loading…
Reference in New Issue
Block a user