diff options
| -rw-r--r-- | sys/arch/arm/arm/conf.c | 11 | ||||
| -rw-r--r-- | sys/arch/moko/include/conf.h | 3 |
2 files changed, 11 insertions, 3 deletions
diff --git a/sys/arch/arm/arm/conf.c b/sys/arch/arm/arm/conf.c index 6a1a53f3fa0..252fafedcc2 100644 --- a/sys/arch/arm/arm/conf.c +++ b/sys/arch/arm/arm/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.19 2008/06/12 20:03:48 mglocker Exp $ */ +/* $OpenBSD: conf.c,v 1.20 2008/11/27 11:40:18 drahn Exp $ */ /* $NetBSD: conf.c,v 1.10 2002/04/19 01:04:38 wiz Exp $ */ /* @@ -66,6 +66,13 @@ */ #include "com.h" /* NS164x0 serial ports */ +#ifdef CONF_HAVE_SSCOM +#include "sscom.h" +cdev_decl(sscom); +#else +#define NSSCOM 0 +#endif + /* * Standard pseudo-devices */ @@ -302,7 +309,7 @@ struct cdevsw cdevsw[] = { cdev_lkm_dummy(), /* 11: */ cdev_tty_init(NCOM,com), /* 12: serial port */ cdev_gpio_init(NGPIO,gpio), /* 13: GPIO interface */ - cdev_lkm_dummy(), /* 14: */ + cdev_tty_init(NSSCOM,sscom), /* 14: alternate serial port */ cdev_lkm_dummy(), /* 15: */ cdev_disk_init(NWD,wd), /* 16: ST506/ESDI/IDE disk */ cdev_lkm_dummy(), /* 17: */ diff --git a/sys/arch/moko/include/conf.h b/sys/arch/moko/include/conf.h index fc45d3f86a6..260ba6ac9d3 100644 --- a/sys/arch/moko/include/conf.h +++ b/sys/arch/moko/include/conf.h @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.h,v 1.1 2008/11/26 14:47:50 drahn Exp $ */ +/* $OpenBSD: conf.h,v 1.2 2008/11/27 11:40:18 drahn Exp $ */ /* $NetBSD: conf.h,v 1.8 2002/02/10 12:26:03 chris Exp $ */ #ifndef _MOKO_CONF_H @@ -13,6 +13,7 @@ //#define CONF_HAVE_APM #define CONF_HAVE_USB #define CONF_HAVE_WSCONS +#define CONF_HAVE_SSCOM #include <arm/conf.h> |