diff options
| author | khorben <khorben@NetBSD.org> | 2015-10-25 22:48:23 +0000 |
|---|---|---|
| committer | khorben <khorben@NetBSD.org> | 2015-10-25 22:48:23 +0000 |
| commit | bf685fca6c8d2a0fed600ff16ca33c43838e3bbf (patch) | |
| tree | 1d92b50dc96c315ff94f2ca2125aec7a971bc8ed | |
| parent | 1e4f8b487cfd87752a3a0fb09f4a229cc7b6e94f (diff) | |
Remove references to SPLASHSCREEN_PROGRESS
To my knowledge this feature is no longer supported at the moment. The
manual page for wsdisplay(4) should probably also be updated to reflect
this situation.
| -rw-r--r-- | sys/arch/amd64/conf/ALL | 5 | ||||
| -rw-r--r-- | sys/arch/evbarm/conf/MMNET_GENERIC | 5 | ||||
| -rw-r--r-- | sys/arch/i386/conf/ALL | 5 | ||||
| -rw-r--r-- | sys/dev/pci/unichromefb.c | 6 |
4 files changed, 8 insertions, 13 deletions
diff --git a/sys/arch/amd64/conf/ALL b/sys/arch/amd64/conf/ALL index 0ba24cb2023..4a26c6962a2 100644 --- a/sys/arch/amd64/conf/ALL +++ b/sys/arch/amd64/conf/ALL @@ -1,4 +1,4 @@ -# $NetBSD: ALL,v 1.31 2015/09/26 16:33:16 maxv Exp $ +# $NetBSD: ALL,v 1.32 2015/10/25 22:48:23 khorben Exp $ # From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp # # ALL machine description file @@ -17,7 +17,7 @@ include "arch/amd64/conf/std.amd64" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "ALL-$Revision: 1.31 $" +#ident "ALL-$Revision: 1.32 $" maxusers 64 # estimated number of users @@ -312,7 +312,6 @@ options WSDISPLAY_SCROLLSUPPORT #options VGA_RASTERCONSOLE # enable splash screen support; requires hw driver support #options SPLASHSCREEN -#options SPLASHSCREEN_PROGRESS # Keylock support options KEYLOCK diff --git a/sys/arch/evbarm/conf/MMNET_GENERIC b/sys/arch/evbarm/conf/MMNET_GENERIC index d64ae1f8bf5..18320f6fddc 100644 --- a/sys/arch/evbarm/conf/MMNET_GENERIC +++ b/sys/arch/evbarm/conf/MMNET_GENERIC @@ -1,4 +1,4 @@ -# $NetBSD: MMNET_GENERIC,v 1.21 2015/09/26 11:16:12 maxv Exp $ +# $NetBSD: MMNET_GENERIC,v 1.22 2015/10/25 22:48:23 khorben Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/evbarm/conf/std.mmnet" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.21 $" +#ident "GENERIC-$Revision: 1.22 $" maxusers 32 # estimated number of users @@ -240,7 +240,6 @@ options NFS_BOOT_DHCP,NFS_BOOT_BOOTPARAM #options VGA_RASTERCONSOLE # enable splash screen support; requires hw driver support #options SPLASHSCREEN -#options SPLASHSCREEN_PROGRESS # Kernel root file system and dump configuration. #config netbsd root on sd0c type ffs diff --git a/sys/arch/i386/conf/ALL b/sys/arch/i386/conf/ALL index b814425da37..3524f8e5715 100644 --- a/sys/arch/i386/conf/ALL +++ b/sys/arch/i386/conf/ALL @@ -1,4 +1,4 @@ -# $NetBSD: ALL,v 1.396 2015/09/26 16:33:16 maxv Exp $ +# $NetBSD: ALL,v 1.397 2015/10/25 22:48:23 khorben Exp $ # From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp # # ALL machine description file @@ -17,7 +17,7 @@ include "arch/i386/conf/std.i386" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "ALL-$Revision: 1.396 $" +#ident "ALL-$Revision: 1.397 $" maxusers 64 # estimated number of users @@ -311,7 +311,6 @@ options WSDISPLAY_SCROLLSUPPORT #options VGA_RASTERCONSOLE # enable splash screen support; requires hw driver support #options SPLASHSCREEN -#options SPLASHSCREEN_PROGRESS # Keylock support options KEYLOCK diff --git a/sys/dev/pci/unichromefb.c b/sys/dev/pci/unichromefb.c index 4c7e7b9fb4f..7de4aa8cc1c 100644 --- a/sys/dev/pci/unichromefb.c +++ b/sys/dev/pci/unichromefb.c @@ -1,4 +1,4 @@ -/* $NetBSD: unichromefb.c,v 1.18 2011/01/22 15:14:28 cegger Exp $ */ +/* $NetBSD: unichromefb.c,v 1.19 2015/10/25 22:48:23 khorben Exp $ */ /*- * Copyright (c) 2006, 2008 Jared D. McNeill <jmcneill@invisible.ca> @@ -51,7 +51,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: unichromefb.c,v 1.18 2011/01/22 15:14:28 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: unichromefb.c,v 1.19 2015/10/25 22:48:23 khorben Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -471,8 +471,6 @@ unichromefb_ioctl(void *v, void *vs, u_long cmd, void *data, int flag, return 0; case WSDISPLAYIO_SSPLASH: return ENODEV; - case WSDISPLAYIO_SPROGRESS: - return ENODEV; /* PCI config read/write passthrough. */ case PCI_IOC_CFGREAD: |
