diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-07-31 20:37:25 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-07-31 20:37:25 -0400 |
| commit | 57cad8084e0837e0f2c97da789ec9b3f36809be9 (patch) | |
| tree | e9c790afb4286f78cb08d9664f58baa7e876fe55 /arch/mips/kernel/setup.c | |
| parent | cb18bd40030c879cd93fef02fd579f74dbab473d (diff) | |
| parent | 49b1e3ea19b1c95c2f012b8331ffb3b169e4c042 (diff) | |
Merge branch 'merge'
Diffstat (limited to 'arch/mips/kernel/setup.c')
| -rw-r--r-- | arch/mips/kernel/setup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/kernel/setup.c b/arch/mips/kernel/setup.c index 5edd8d4bb665..8c2b596a136f 100644 --- a/arch/mips/kernel/setup.c +++ b/arch/mips/kernel/setup.c | |||
| @@ -24,7 +24,7 @@ | |||
| 24 | #include <linux/user.h> | 24 | #include <linux/user.h> |
| 25 | #include <linux/utsname.h> | 25 | #include <linux/utsname.h> |
| 26 | #include <linux/a.out.h> | 26 | #include <linux/a.out.h> |
| 27 | #include <linux/tty.h> | 27 | #include <linux/screen_info.h> |
| 28 | #include <linux/bootmem.h> | 28 | #include <linux/bootmem.h> |
| 29 | #include <linux/initrd.h> | 29 | #include <linux/initrd.h> |
| 30 | #include <linux/major.h> | 30 | #include <linux/major.h> |