diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2000-06-21 01:44:39 +0000 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2000-06-21 01:44:39 +0000 |
commit | 5205a16d8870cdd4cc524589de3e09ad176d129a (patch) | |
tree | 6deddf1269b9e6f13f2fa00529cd4674c3b2a3fa /arch/alpha | |
parent | e8b2e78e4f14d329f2cdfb8ef7ed3582c71454e5 (diff) |
Merge with Linux 2.4.0-ac22-riel.
Diffstat (limited to 'arch/alpha')
-rw-r--r-- | arch/alpha/kernel/console.c | 1 | ||||
-rw-r--r-- | arch/alpha/kernel/core_titan.c | 1 | ||||
-rw-r--r-- | arch/alpha/kernel/sys_titan.c | 1 | ||||
-rw-r--r-- | arch/alpha/kernel/sys_wildfire.c | 1 |
4 files changed, 3 insertions, 1 deletions
diff --git a/arch/alpha/kernel/console.c b/arch/alpha/kernel/console.c index ac2e49817..b946ce0ed 100644 --- a/arch/alpha/kernel/console.c +++ b/arch/alpha/kernel/console.c @@ -5,6 +5,7 @@ * non-0 I/O hose */ +#include <linux/config.h> #include <linux/pci.h> #include <linux/init.h> #include <linux/tty.h> diff --git a/arch/alpha/kernel/core_titan.c b/arch/alpha/kernel/core_titan.c index 65bcc8651..37dd8b3c3 100644 --- a/arch/alpha/kernel/core_titan.c +++ b/arch/alpha/kernel/core_titan.c @@ -4,6 +4,7 @@ * Code common to all TITAN core logic chips. */ +#include <linux/config.h> #include <linux/kernel.h> #include <linux/types.h> #include <linux/pci.h> diff --git a/arch/alpha/kernel/sys_titan.c b/arch/alpha/kernel/sys_titan.c index 5b3011d07..190b76bd9 100644 --- a/arch/alpha/kernel/sys_titan.c +++ b/arch/alpha/kernel/sys_titan.c @@ -10,6 +10,7 @@ * Privateer */ +#include <linux/config.h> #include <linux/kernel.h> #include <linux/types.h> #include <linux/mm.h> diff --git a/arch/alpha/kernel/sys_wildfire.c b/arch/alpha/kernel/sys_wildfire.c index 7aa49f50b..276195040 100644 --- a/arch/alpha/kernel/sys_wildfire.c +++ b/arch/alpha/kernel/sys_wildfire.c @@ -6,7 +6,6 @@ * Copyright (C) 2000 Andrea Arcangeli <andrea@suse.de> SuSE */ -#include <linux/config.h> #include <linux/kernel.h> #include <linux/types.h> #include <linux/mm.h> |