diff options
author | Miod Vallat <miod@cvs.openbsd.org> | 2010-09-01 04:52:44 +0000 |
---|---|---|
committer | Miod Vallat <miod@cvs.openbsd.org> | 2010-09-01 04:52:44 +0000 |
commit | 5ed78028ed6a88b7609d6a7907f4b01422040bc8 (patch) | |
tree | f9ed5ae5c5aaa682be0469455c0fc431be7fb22f /sys/arch | |
parent | 9951897a9b740fdba139884bcd18968ee99c23db (diff) |
Let non-ykbec kernels link again.
Diffstat (limited to 'sys/arch')
-rw-r--r-- | sys/arch/loongson/conf/files.loongson | 4 | ||||
-rw-r--r-- | sys/arch/loongson/loongson/yeeloong_machdep.c | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/sys/arch/loongson/conf/files.loongson b/sys/arch/loongson/conf/files.loongson index 1fb209cdc08..8f8e6bca732 100644 --- a/sys/arch/loongson/conf/files.loongson +++ b/sys/arch/loongson/conf/files.loongson @@ -1,4 +1,4 @@ -# $OpenBSD: files.loongson,v 1.11 2010/05/08 21:59:53 miod Exp $ +# $OpenBSD: files.loongson,v 1.12 2010/09/01 04:52:41 miod Exp $ # Standard stanzas config(8) can't run without maxpartitions 16 @@ -84,7 +84,7 @@ file arch/loongson/dev/mcclock_isa.c mcclock_isa # Lemote Yeeloong KB3310B Embedded Controller device ykbec attach ykbec at isa -file arch/loongson/dev/kb3310.c ykbec +file arch/loongson/dev/kb3310.c ykbec needs-flag # Silicon Motion SM502 master device device voyager {}: gpiobus diff --git a/sys/arch/loongson/loongson/yeeloong_machdep.c b/sys/arch/loongson/loongson/yeeloong_machdep.c index 67ef1769e62..3d0851ac22b 100644 --- a/sys/arch/loongson/loongson/yeeloong_machdep.c +++ b/sys/arch/loongson/loongson/yeeloong_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: yeeloong_machdep.c,v 1.13 2010/08/31 10:24:46 pirofti Exp $ */ +/* $OpenBSD: yeeloong_machdep.c,v 1.14 2010/09/01 04:52:43 miod Exp $ */ /* * Copyright (c) 2009, 2010 Miodrag Vallat. @@ -44,6 +44,7 @@ #include <loongson/dev/kb3310var.h> #include "com.h" +#include "ykbec.h" #if NCOM > 0 #include <sys/termios.h> @@ -195,8 +196,10 @@ const struct platform yeeloong_platform = { .powerdown = yeeloong_powerdown, .reset = lemote_reset, +#if NYKBEC > 0 .suspend = ykbec_suspend, .resume = ykbec_resume +#endif }; /* |