Module Name: src
Committed By: christos
Date: Mon Apr 9 19:11:38 UTC 2018
Modified Files:
src/sys/arch/sgimips/conf: GENERIC32_IP2x
src/sys/arch/sgimips/hpc: files.hpc
Log Message:
rename "panel" to "button" to avoid conflict with fdt
To generate a diff of this commit:
cvs rdiff -u -r1.112 -r1.113 src/sys/arch/sgimips/conf/GENERIC32_IP2x
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/sgimips/hpc/files.hpc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/sgimips/conf/GENERIC32_IP2x
diff -u src/sys/arch/sgimips/conf/GENERIC32_IP2x:1.112 src/sys/arch/sgimips/conf/GENERIC32_IP2x:1.113
--- src/sys/arch/sgimips/conf/GENERIC32_IP2x:1.112 Tue Jan 23 09:47:56 2018
+++ src/sys/arch/sgimips/conf/GENERIC32_IP2x Mon Apr 9 15:11:38 2018
@@ -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
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
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?
Index: src/sys/arch/sgimips/hpc/files.hpc
diff -u src/sys/arch/sgimips/hpc/files.hpc:1.14 src/sys/arch/sgimips/hpc/files.hpc:1.15
--- src/sys/arch/sgimips/hpc/files.hpc:1.14 Wed May 13 21:10:19 2009
+++ src/sys/arch/sgimips/hpc/files.hpc Mon Apr 9 15:11:38 2018
@@ -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
