diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2010-09-26 20:39:09 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2010-09-26 20:39:09 +0000 |
| commit | 7fde2299b4752614becf369bf6cf0e69fcc858be (patch) | |
| tree | f6e6539d443aa4fa956790391a3dbe63b2c799ef /sys/arch/loongson | |
| parent | a0bbe5baf821963522edd04f536509b4351ca7ab (diff) | |
Merge pmsi(4) into pms(4). From Alexandr Shadchin on tech@.
Diffstat (limited to 'sys/arch/loongson')
| -rw-r--r-- | sys/arch/loongson/conf/GENERIC | 6 | ||||
| -rw-r--r-- | sys/arch/loongson/conf/RAMDISK | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/sys/arch/loongson/conf/GENERIC b/sys/arch/loongson/conf/GENERIC index 670936256e0..12de741abd6 100644 --- a/sys/arch/loongson/conf/GENERIC +++ b/sys/arch/loongson/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.25 2010/09/23 16:21:46 yuo Exp $ +# $OpenBSD: GENERIC,v 1.26 2010/09/26 20:39:08 miod Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -44,8 +44,8 @@ mcclock0 at isa? port 0x70 pckbc0 at isa? # Yeeloong only pckbd* at pckbc? # Yeeloong only wskbd* at pckbd? mux 1 # Yeeloong only -pmsi* at pckbc? # Yeeloong only -wsmouse* at pmsi? mux 0 # Yeeloong only +pms* at pckbc? # Yeeloong only +wsmouse* at pms? mux 0 # Yeeloong only ykbec0 at isa? port 0x381 # Yeeloong only com0 at isa? port 0x2f8 irq 3 # Fuloong 2F only com1 at isa? port 0x3f8 irq 4 # Fuloong 2F only (IR port) diff --git a/sys/arch/loongson/conf/RAMDISK b/sys/arch/loongson/conf/RAMDISK index d0d6c924957..030a84fa599 100644 --- a/sys/arch/loongson/conf/RAMDISK +++ b/sys/arch/loongson/conf/RAMDISK @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK,v 1.13 2010/07/03 03:59:16 krw Exp $ +# $OpenBSD: RAMDISK,v 1.14 2010/09/26 20:39:08 miod Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -54,8 +54,8 @@ mcclock0 at isa? port 0x70 pckbc0 at isa? # Yeeloong only pckbd* at pckbc? # Yeeloong only wskbd* at pckbd? mux 1 # Yeeloong only -pmsi* at pckbc? # Yeeloong only -wsmouse* at pmsi? mux 0 # Yeeloong only +pms* at pckbc? # Yeeloong only +wsmouse* at pms? mux 0 # Yeeloong only com0 at isa? port 0x2f8 irq 3 # Fuloong 2F only pciide* at pci? wd* at pciide? flags 0x0000 |