From b28016e6912996a0b4bbd58a6244895705406053 Mon Sep 17 00:00:00 2001 From: Ralf Baechle Date: Tue, 29 Jul 2003 11:21:05 +0000 Subject: [PATCH] Whoops, missed one. Another 55 lines gone. --- include/asm-mips/mips-boards/prom.h | 14 +++------- include/asm-mips64/mips-boards/prom.h | 49 ----------------------------------- 2 files changed, 4 insertions(+), 59 deletions(-) delete mode 100644 include/asm-mips64/mips-boards/prom.h diff --git a/include/asm-mips/mips-boards/prom.h b/include/asm-mips/mips-boards/prom.h index b5b61c1caeb..78bdc2c76be 100644 --- a/include/asm-mips/mips-boards/prom.h +++ b/include/asm-mips/mips-boards/prom.h @@ -2,8 +2,6 @@ * Carsten Langgaard, carstenl@mips.com * Copyright (C) 2000 MIPS Technologies, Inc. All rights reserved. * - * ######################################################################## - * * This program is free software; you can distribute it and/or modify it * under the terms of the GNU General Public License (Version 2) as * published by the Free Software Foundation. @@ -17,14 +15,10 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 59 Temple Place - Suite 330, Boston MA 02111-1307, USA. * - * ######################################################################## - * * MIPS boards bootprom interface for the Linux kernel. - * */ - -#ifndef _MIPS_PROM_H -#define _MIPS_PROM_H +#ifndef _ASM_MIPS_BOARDS_PROM_H +#define _ASM_MIPS_BOARDS_PROM_H extern char *prom_getcmdline(void); extern char *prom_getenv(char *name); @@ -41,9 +35,9 @@ extern int get_ethernet_addr(char *ethernet_addr); /* Memory descriptor management. */ #define PROM_MAX_PMEMBLOCKS 32 struct prom_pmemblock { - unsigned long base; /* Within KSEG0. */ + unsigned long base; /* Phys addr. */ unsigned int size; /* In bytes. */ unsigned int type; /* free or prom memory */ }; -#endif /* !(_MIPS_PROM_H) */ +#endif /* _ASM_MIPS_BOARDS_PROM_H */ diff --git a/include/asm-mips64/mips-boards/prom.h b/include/asm-mips64/mips-boards/prom.h deleted file mode 100644 index 09720e97485..00000000000 --- a/include/asm-mips64/mips-boards/prom.h +++ /dev/null @@ -1,49 +0,0 @@ -/* - * Carsten Langgaard, carstenl@mips.com - * Copyright (C) 2000 MIPS Technologies, Inc. All rights reserved. - * - * ######################################################################## - * - * This program is free software; you can distribute it and/or modify it - * under the terms of the GNU General Public License (Version 2) as - * published by the Free Software Foundation. - * - * This program is distributed in the hope it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place - Suite 330, Boston MA 02111-1307, USA. - * - * ######################################################################## - * - * MIPS boards bootprom interface for the Linux kernel. - * - */ - -#ifndef _MIPS_PROM_H -#define _MIPS_PROM_H - -extern char *prom_getcmdline(void); -extern char *prom_getenv(char *name); -extern void setup_prom_printf(int tty_no); -extern void prom_printf(char *fmt, ...); -extern void prom_init_cmdline(void); -extern void prom_meminit(void); -extern void prom_fixup_mem_map(unsigned long start_mem, unsigned long end_mem); -extern void prom_free_prom_memory (void); -extern void mips_display_message(const char *str); -extern void mips_display_word(unsigned int num); -extern int get_ethernet_addr(char *ethernet_addr); - -/* Memory descriptor management. */ -#define PROM_MAX_PMEMBLOCKS 32 -struct prom_pmemblock { - unsigned int base; /* Phys addr. */ - unsigned int size; /* In bytes. */ - unsigned int type; /* free or prom memory */ -}; - -#endif /* !(_MIPS_PROM_H) */ -- 2.11.4.GIT