[src/trunk]: src/sys/arch/sgimips rename "panel" to "button" to avoid conflic...

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

details:   https://anonhg.NetBSD.org/src/rev/de810fb5cb93
branches:  trunk
changeset: 361021:de810fb5cb93
user:      christos <christos%NetBSD.org@localhost>
date:      Mon Apr 09 19:11:38 2018 +0000

description:
rename "panel" to "button" to avoid conflict with fdt

diffstat:

 sys/arch/sgimips/conf/GENERIC32_IP2x |  6 +++---
 sys/arch/sgimips/hpc/files.hpc       |  8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diffs (46 lines):

diff -r 016116e6a6a7 -r de810fb5cb93 sys/arch/sgimips/conf/GENERIC32_IP2x
--- a/sys/arch/sgimips/conf/GENERIC32_IP2x      Mon Apr 09 19:06:34 2018 +0000
+++ b/sys/arch/sgimips/conf/GENERIC32_IP2x      Mon Apr 09 19:11:38 2018 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: GENERIC32_IP2x,v 1.112 2018/01/23 14:47:56 sevan Exp $
+#      $NetBSD: GENERIC32_IP2x,v 1.113 2018/04/09 19:11:38 christos Exp $
 #
 # GENERIC32_IP2x machine description file
 # 
@@ -29,7 +29,7 @@
 
 options        INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident         "GENERIC32-IP2x-$Revision: 1.112 $"
+#ident         "GENERIC32-IP2x-$Revision: 1.113 $"
 
 maxusers       32
 
@@ -238,7 +238,7 @@
 sq*            at hpc? offset ?        # On-board ethernet / E++ adapter
 wdsc*          at hpc? offset ?        # On-board SCSI / GIO32 SCSI adapter
 haltwo*         at hpc0 offset ?       # IP22 / 24
-panel*         at hpc0 offset ?        # front panel buttons on Indy
+button*                at hpc0 offset ?        # front panel buttons on Indy
 pckbc*         at hpc0 offset ?
 
 pckbd*         at pckbc?
diff -r 016116e6a6a7 -r de810fb5cb93 sys/arch/sgimips/hpc/files.hpc
--- a/sys/arch/sgimips/hpc/files.hpc    Mon Apr 09 19:06:34 2018 +0000
+++ b/sys/arch/sgimips/hpc/files.hpc    Mon Apr 09 19:11:38 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: files.hpc,v 1.14 2009/05/14 01:10:19 macallan Exp $
+# $NetBSD: files.hpc,v 1.15 2018/04/09 19:11:38 christos Exp $
 
 device sq: arp, ether, ifnet
 attach sq at hpc
@@ -25,6 +25,6 @@
 attach pi1ppc at hpc
 file   arch/sgimips/hpc/pi1ppc.c       pi1ppc
 
-device panel : sysmon_power, sysmon_taskq
-attach panel at hpc
-file   arch/sgimips/hpc/panel.c        panel
+device button : sysmon_power, sysmon_taskq
+attach button at hpc
+file   arch/sgimips/hpc/panel.c        button