[src/trunk]: src/sys/dev/pci back out 1.35 since it completely breaks the mec...

[macallan <macallan%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/45a0ab149fd0
branches:  trunk
changeset: 326365:45a0ab149fd0
user:      macallan <macallan%NetBSD.org@localhost>
date:      Mon Jan 27 13:22:55 2014 +0000

description:
back out 1.35 since it completely breaks the mechanism for wsdisplay drivers
to determine wether to become console or not.
See http://mail-index.netbsd.org/tech-kern/2014/01/15/msg016421.html
for fixing this properly.

diffstat:

 sys/dev/pci/genfb_pci.c |  10 ++--------
 1 files changed, 2 insertions(+), 8 deletions(-)

diffs (40 lines):

diff -r 8660fadf5881 -r 45a0ab149fd0 sys/dev/pci/genfb_pci.c
--- a/sys/dev/pci/genfb_pci.c   Mon Jan 27 08:18:07 2014 +0000
+++ b/sys/dev/pci/genfb_pci.c   Mon Jan 27 13:22:55 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: genfb_pci.c,v 1.35 2014/01/16 18:41:10 jakllsch Exp $ */
+/*     $NetBSD: genfb_pci.c,v 1.36 2014/01/27 13:22:55 macallan Exp $ */
 
 /*-
  * Copyright (c) 2007 Michael Lorenz
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: genfb_pci.c,v 1.35 2014/01/16 18:41:10 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: genfb_pci.c,v 1.36 2014/01/27 13:22:55 macallan Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -99,10 +99,8 @@
        struct pci_genfb_softc *sc = device_private(self);
        struct pci_attach_args *pa = aux;
        struct genfb_ops ops;
-       prop_dictionary_t dict;
        pcireg_t rom;
        int idx, bar, type;
-       bool isconsole;
 
        pci_aprint_devinfo(pa, NULL);
 
@@ -187,10 +185,6 @@
        ops.genfb_mmap = pci_genfb_mmap;
        ops.genfb_borrow = pci_genfb_borrow;
 
-       isconsole = genfb_is_console() != 0;
-       dict = device_properties(self);
-       prop_dictionary_set_bool(dict, "is_console", isconsole);
-
        if (genfb_attach(&sc->sc_gen, &ops) == 0) {
 
                /* now try to attach a DRM */