summaryrefslogtreecommitdiffstats
path: root/include/linux/scc.h
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>1997-12-16 05:34:03 +0000
committerRalf Baechle <ralf@linux-mips.org>1997-12-16 05:34:03 +0000
commit967c65a99059fd459b956c1588ce0ba227912c4e (patch)
tree8224d013ff5d255420713d05610c7efebd204d2a /include/linux/scc.h
parente20c1cc1656a66a2773bca4591a895cbc12696ff (diff)
Merge with Linux 2.1.72, part 1.
Diffstat (limited to 'include/linux/scc.h')
-rw-r--r--include/linux/scc.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/include/linux/scc.h b/include/linux/scc.h
index 275cbbb77..c8a440538 100644
--- a/include/linux/scc.h
+++ b/include/linux/scc.h
@@ -3,6 +3,8 @@
#ifndef _SCC_H
#define _SCC_H
+#include <linux/config.h>
+
/* selection of hardware types */
#define PA0HZP 0x00 /* hardware type for PA0HZP SCC card and compatible */
@@ -184,7 +186,7 @@ enum {TX_OFF, TX_ON}; /* command for scc_key_trx() */
#define RXINT 0x04
#define SPINT 0x06
-#ifdef SCC_DELAY
+#ifdef CONFIG_SCC_DELAY
#define Inb(port) inb_p(port)
#define Outb(port, val) outb_p(val, port)
#else