diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-15 22:30:35 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-15 22:30:35 +0200 |
| commit | 43d39ae0cf8f891c35e8316948229c7cbffa3994 (patch) | |
| tree | c8af6999a9327c8b9bbc7384efe8f52f851ff3d8 /arch/mips/au1000/pb1200/init.c | |
| parent | Atari keyboard: incorporate additional review comments (diff) | |
| parent | xen-netfront: rearrange netfront structure to separate tx and rx (diff) | |
| download | linux-43d39ae0cf8f891c35e8316948229c7cbffa3994.tar.xz linux-43d39ae0cf8f891c35e8316948229c7cbffa3994.zip | |
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: (35 commits)
xen-netfront: rearrange netfront structure to separate tx and rx
netdev: convert non-obvious instances to use ARRAY_SIZE()
ucc_geth: Fix build break introduced by commit 09f75cd7bf13720738e6a196cc0107ce9a5bd5a0
gianfar: Fix regression caused by new napi interface
gianfar: Cleanup compile warning caused by 0795af57
gianfar: Fix compile regression caused by bea3348e
add new prom.h for AU1x00
update AU1000 get_ethernet_addr()
MIPSsim: General cleanup
Jazzsonic: Fix warning about unused variable.
Remove msic_dcr_read() in axon_msi.c
Use dcr_host_t.base in dcr_unmap()
Add dcr_host_t.base in dcr_read()/dcr_write()
Use dcr_host_t.base in ibm_emac_mal
Update ibm_newemac to use dcr_host_t.base
tehuti: possible leak in bdx_probe
TC35815: Fix build
SAA9730: Fix build
AR7 ethernet
myri10ge: update driver version to 1.3.2-1.287
...
Diffstat (limited to 'arch/mips/au1000/pb1200/init.c')
| -rw-r--r-- | arch/mips/au1000/pb1200/init.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/arch/mips/au1000/pb1200/init.c b/arch/mips/au1000/pb1200/init.c index 5a70029d5388..c251570749ee 100644 --- a/arch/mips/au1000/pb1200/init.c +++ b/arch/mips/au1000/pb1200/init.c @@ -31,15 +31,13 @@ #include <linux/mm.h> #include <linux/sched.h> #include <linux/bootmem.h> -#include <asm/addrspace.h> -#include <asm/bootinfo.h> #include <linux/string.h> #include <linux/kernel.h> -int prom_argc; -char **prom_argv, **prom_envp; -extern void __init prom_init_cmdline(void); -extern char *prom_getenv(char *envname); +#include <asm/addrspace.h> +#include <asm/bootinfo.h> + +#include <prom.h> const char *get_system_type(void) { |