From owner-svn-src-stable@freebsd.org  Sun Dec 22 19:14:34 2019
Return-Path: <owner-svn-src-stable@freebsd.org>
Delivered-To: svn-src-stable@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.nyi.freebsd.org (Postfix) with ESMTP id 58F7F1DA418;
 Sun, 22 Dec 2019 19:14:34 +0000 (UTC)
 (envelope-from kevans@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
 server-signature RSA-PSS (4096 bits)
 client-signature RSA-PSS (4096 bits) client-digest SHA256)
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 47gscB1jMnz3Dy9;
 Sun, 22 Dec 2019 19:14:34 +0000 (UTC)
 (envelope-from kevans@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 35E4542AA;
 Sun, 22 Dec 2019 19:14:34 +0000 (UTC)
 (envelope-from kevans@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id xBMJEYJ5028898;
 Sun, 22 Dec 2019 19:14:34 GMT (envelope-from kevans@FreeBSD.org)
Received: (from kevans@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id xBMJEYGJ028897;
 Sun, 22 Dec 2019 19:14:34 GMT (envelope-from kevans@FreeBSD.org)
Message-Id: <201912221914.xBMJEYGJ028897@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: kevans set sender to
 kevans@FreeBSD.org using -f
From: Kyle Evans <kevans@FreeBSD.org>
Date: Sun, 22 Dec 2019 19:14:34 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org
Subject: svn commit: r356021 - in stable: 11/sys/arm/versatile
 12/sys/arm/versatile
X-SVN-Group: stable-12
X-SVN-Commit-Author: kevans
X-SVN-Commit-Paths: in stable: 11/sys/arm/versatile 12/sys/arm/versatile
X-SVN-Commit-Revision: 356021
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable>, 
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable/>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 22 Dec 2019 19:14:34 -0000

Author: kevans
Date: Sun Dec 22 19:14:33 2019
New Revision: 356021
URL: https://svnweb.freebsd.org/changeset/base/356021

Log:
  MFC r355932: VERSATILEPB: also use default get_fkeystr/diag
  
  In head/, this config was broken from the defaulting commits, but in stable
  branches we left the genkbd_* defaults exposed. Do this anyways.

Modified:
  stable/12/sys/arm/versatile/pl050.c
Directory Properties:
  stable/12/   (props changed)

Changes in other areas also in this revision:
Modified:
  stable/11/sys/arm/versatile/pl050.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/12/sys/arm/versatile/pl050.c
==============================================================================
--- stable/12/sys/arm/versatile/pl050.c	Sun Dec 22 19:06:45 2019	(r356020)
+++ stable/12/sys/arm/versatile/pl050.c	Sun Dec 22 19:14:33 2019	(r356021)
@@ -578,9 +578,7 @@ static keyboard_switch_t kmisw = {
 	.clear_state = &kmi_clear_state,
 	.get_state = &kmi_get_state,
 	.set_state = &kmi_set_state,
-	.get_fkeystr = &genkbd_get_fkeystr,
 	.poll = &kmi_poll,
-	.diag = &genkbd_diag,
 };
 
 KEYBOARD_DRIVER(kmi, kmisw, kmi_configure);