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/ppc | |
| parent | e8b2e78e4f14d329f2cdfb8ef7ed3582c71454e5 (diff) | |
Merge with Linux 2.4.0-ac22-riel.
Diffstat (limited to 'arch/ppc')
| -rw-r--r-- | arch/ppc/8xx_io/fec.c | 1 | ||||
| -rw-r--r-- | arch/ppc/mbxboot/embed_config.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/arch/ppc/8xx_io/fec.c b/arch/ppc/8xx_io/fec.c index 190113db2..f69d0dfbd 100644 --- a/arch/ppc/8xx_io/fec.c +++ b/arch/ppc/8xx_io/fec.c @@ -26,6 +26,7 @@ #define CONFIG_FEC_LXT971 #define CONFIG_FEC_QS6612 +#include <linux/config.h> #include <linux/kernel.h> #include <linux/sched.h> #include <linux/string.h> diff --git a/arch/ppc/mbxboot/embed_config.c b/arch/ppc/mbxboot/embed_config.c index 11c37f796..b9a37a76c 100644 --- a/arch/ppc/mbxboot/embed_config.c +++ b/arch/ppc/mbxboot/embed_config.c @@ -3,7 +3,7 @@ * not have boot monitor support for board information. */ #include <sys/types.h> -#include <linux/autoconf.h> +#include <linux/config.h> #ifdef CONFIG_8xx #include <asm/mpc8xx.h> #endif |