diff options
| author | Paul Mackerras <paulus@samba.org> | 2005-10-30 21:37:12 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-10-30 21:37:12 -0500 |
| commit | 23fd07750a789a66fe88cf173d52a18f1a387da4 (patch) | |
| tree | 06fdd6df35fdb835abdaa9b754d62f6b84b97250 /arch/mips/au1000/hydrogen3 | |
| parent | bd787d438a59266af3c9f6351644c85ef1dd21fe (diff) | |
| parent | ed28f96ac1960f30f818374d65be71d2fdf811b0 (diff) | |
Merge ../linux-2.6 by hand
Diffstat (limited to 'arch/mips/au1000/hydrogen3')
| -rw-r--r-- | arch/mips/au1000/hydrogen3/init.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/mips/au1000/hydrogen3/init.c b/arch/mips/au1000/hydrogen3/init.c index 8cc9879dd582..01ab28483959 100644 --- a/arch/mips/au1000/hydrogen3/init.c +++ b/arch/mips/au1000/hydrogen3/init.c | |||
| @@ -37,7 +37,6 @@ | |||
| 37 | #include <linux/config.h> | 37 | #include <linux/config.h> |
| 38 | #include <linux/string.h> | 38 | #include <linux/string.h> |
| 39 | #include <linux/kernel.h> | 39 | #include <linux/kernel.h> |
| 40 | #include <linux/sched.h> | ||
| 41 | 40 | ||
| 42 | int prom_argc; | 41 | int prom_argc; |
| 43 | char **prom_argv, **prom_envp; | 42 | char **prom_argv, **prom_envp; |