Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

MIPS: FW: Remove obsolete header file for MTI platforms.

Remove 'arch/mips/include/asm/mips-boards/prom.h' and get rid of
all inclusions of it by Malta and SEAD-3 platforms.

[ralf@linux-mips.org: Fold in John Crispin <blogic@openwrt.org>'s "MIPS:
ar7 powertv build"].

[ralf@linux-mips.org: Fold in John Crispin <blogic@openwrt.org>'s "MIPS:
unbreak powertv build"].

[ralf@linux-mips.org: Test. Build. Your. Fscking. Code. Or...]

Signed-off-by: Steven J. Hill <Steven.Hill@imgtec.com>

authored by

Steven J. Hill and committed by
Ralf Baechle
270690e0 b431f09d

+4 -61
-1
arch/mips/ar7/memory.c
··· 30 30 #include <asm/sections.h> 31 31 32 32 #include <asm/mach-ar7/ar7.h> 33 - #include <asm/mips-boards/prom.h> 34 33 35 34 static int __init memsize(void) 36 35 {
-47
arch/mips/include/asm/mips-boards/prom.h
··· 1 - /* 2 - * Carsten Langgaard, carstenl@mips.com 3 - * Copyright (C) 2000 MIPS Technologies, Inc. All rights reserved. 4 - * 5 - * ######################################################################## 6 - * 7 - * This program is free software; you can distribute it and/or modify it 8 - * under the terms of the GNU General Public License (Version 2) as 9 - * published by the Free Software Foundation. 10 - * 11 - * This program is distributed in the hope it will be useful, but WITHOUT 12 - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or 13 - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 14 - * for more details. 15 - * 16 - * You should have received a copy of the GNU General Public License along 17 - * with this program; if not, write to the Free Software Foundation, Inc., 18 - * 59 Temple Place - Suite 330, Boston MA 02111-1307, USA. 19 - * 20 - * ######################################################################## 21 - * 22 - * MIPS boards bootprom interface for the Linux kernel. 23 - * 24 - */ 25 - 26 - #ifndef _MIPS_PROM_H 27 - #define _MIPS_PROM_H 28 - 29 - extern char *prom_getcmdline(void); 30 - extern char *prom_getenv(char *name); 31 - extern void prom_init_cmdline(void); 32 - extern void prom_meminit(void); 33 - extern void prom_fixup_mem_map(unsigned long start_mem, unsigned long end_mem); 34 - extern void mips_display_message(const char *str); 35 - extern void mips_display_word(unsigned int num); 36 - extern void mips_scroll_message(void); 37 - extern int get_ethernet_addr(char *ethernet_addr); 38 - 39 - /* Memory descriptor management. */ 40 - #define PROM_MAX_PMEMBLOCKS 32 41 - struct prom_pmemblock { 42 - unsigned long base; /* Within KSEG0. */ 43 - unsigned int size; /* In bytes. */ 44 - unsigned int type; /* free or prom memory */ 45 - }; 46 - 47 - #endif /* !(_MIPS_PROM_H) */
-1
arch/mips/mti-malta/malta-display.c
··· 22 22 #include <linux/timer.h> 23 23 #include <asm/io.h> 24 24 #include <asm/mips-boards/generic.h> 25 - #include <asm/mips-boards/prom.h> 26 25 27 26 extern const char display_string[]; 28 27 static unsigned int display_count;
-1
arch/mips/mti-malta/malta-init.c
··· 30 30 #include <asm/traps.h> 31 31 #include <asm/fw/fw.h> 32 32 #include <asm/gcmpregs.h> 33 - #include <asm/mips-boards/prom.h> 34 33 #include <asm/mips-boards/generic.h> 35 34 #include <asm/mips-boards/bonito64.h> 36 35 #include <asm/mips-boards/msc01_pci.h>
-2
arch/mips/mti-malta/malta-memory.c
··· 29 29 #include <asm/sections.h> 30 30 #include <asm/fw/fw.h> 31 31 32 - #include <asm/mips-boards/prom.h> 33 - 34 32 static fw_memblock_t mdesc[FW_MAX_MEMBLOCKS]; 35 33 36 34 /* determined physical memory size, not overridden by command line args */
-2
arch/mips/mti-malta/malta-time.c
··· 39 39 #include <asm/gic.h> 40 40 41 41 #include <asm/mips-boards/generic.h> 42 - #include <asm/mips-boards/prom.h> 43 - 44 42 #include <asm/mips-boards/maltaint.h> 45 43 46 44 unsigned long cpu_khz;
-1
arch/mips/mti-sead3/sead3-display.c
··· 8 8 #include <linux/timer.h> 9 9 #include <linux/io.h> 10 10 #include <asm/mips-boards/generic.h> 11 - #include <asm/mips-boards/prom.h> 12 11 13 12 static unsigned int display_count; 14 13 static unsigned int max_display_count;
-1
arch/mips/mti-sead3/sead3-init.c
··· 12 12 #include <asm/cacheflush.h> 13 13 #include <asm/traps.h> 14 14 #include <asm/mips-boards/generic.h> 15 - #include <asm/mips-boards/prom.h> 16 15 #include <asm/fw/fw.h> 17 16 18 17 extern char except_vec_nmi;
-1
arch/mips/mti-sead3/sead3-setup.c
··· 11 11 #include <linux/bootmem.h> 12 12 13 13 #include <asm/mips-boards/generic.h> 14 - #include <asm/prom.h> 15 14 16 15 const char *get_system_type(void) 17 16 {
-1
arch/mips/mti-sead3/sead3-time.c
··· 11 11 #include <asm/time.h> 12 12 #include <asm/irq.h> 13 13 #include <asm/mips-boards/generic.h> 14 - #include <asm/mips-boards/prom.h> 15 14 16 15 unsigned long cpu_khz; 17 16
+2 -1
arch/mips/powertv/init.c
··· 29 29 #include <asm/cacheflush.h> 30 30 #include <asm/traps.h> 31 31 32 - #include <asm/mips-boards/prom.h> 33 32 #include <asm/mips-boards/generic.h> 34 33 #include <asm/mach-powertv/asic.h> 34 + 35 + #include "init.h" 35 36 36 37 static int *_prom_envp; 37 38 unsigned long _prom_memsize;
+2
arch/mips/powertv/init.h
··· 23 23 #ifndef _POWERTV_INIT_H 24 24 #define _POWERTV_INIT_H 25 25 extern unsigned long _prom_memsize; 26 + extern void prom_meminit(void); 27 + extern char *prom_getenv(char *name); 26 28 #endif
-1
arch/mips/powertv/memory.c
··· 29 29 #include <asm/page.h> 30 30 #include <asm/sections.h> 31 31 32 - #include <asm/mips-boards/prom.h> 33 32 #include <asm/mach-powertv/asic.h> 34 33 #include <asm/mach-powertv/ioremap.h> 35 34
-1
arch/mips/powertv/powertv_setup.c
··· 31 31 #include <asm/bootinfo.h> 32 32 #include <asm/irq.h> 33 33 #include <asm/mips-boards/generic.h> 34 - #include <asm/mips-boards/prom.h> 35 34 #include <asm/dma.h> 36 35 #include <asm/asm.h> 37 36 #include <asm/traps.h>