summaryrefslogtreecommitdiff
path: root/sys/arch
diff options
context:
space:
mode:
authorchristos <christos@NetBSD.org>2018-04-09 19:11:38 +0000
committerchristos <christos@NetBSD.org>2018-04-09 19:11:38 +0000
commitdea11817f5e9dfe85640169cc77b3c688d5356b5 (patch)
treeebbe7224b90d128e65887f5b8a53a3bc93ea4fdd /sys/arch
parent18a75a6ee60dbac9c8b05e684fb667b222cac3f2 (diff)
rename "panel" to "button" to avoid conflict with fdt
Diffstat (limited to 'sys/arch')
-rw-r--r--sys/arch/sgimips/conf/GENERIC32_IP2x6
-rw-r--r--sys/arch/sgimips/hpc/files.hpc8
2 files changed, 7 insertions, 7 deletions
diff --git a/sys/arch/sgimips/conf/GENERIC32_IP2x b/sys/arch/sgimips/conf/GENERIC32_IP2x
index 71e1d6f5165..b4fb01c0bd0 100644
--- a/sys/arch/sgimips/conf/GENERIC32_IP2x
+++ b/sys/arch/sgimips/conf/GENERIC32_IP2x
@@ -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 @@ makeoptions TEXTADDR=0x88069000 # entry point
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 @@ tlphy* at mii? phy ? # ThunderLAN PHY (unused)
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 --git a/sys/arch/sgimips/hpc/files.hpc b/sys/arch/sgimips/hpc/files.hpc
index 083faaa0b52..b21a4a8d8b1 100644
--- a/sys/arch/sgimips/hpc/files.hpc
+++ b/sys/arch/sgimips/hpc/files.hpc
@@ -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 @@ device pi1ppc: parport
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