diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2006-07-17 09:25:26 -0400 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-07-17 09:25:26 -0400 |
| commit | 4bf311ddfbffe12d41ad1a3c311ab727db6f72cb (patch) | |
| tree | 9d19a2774e83637d86dc876f3af22af1dacf0bec /arch/mips/kernel/setup.c | |
| parent | 597d0cae0f99f62501e229bed50e8149604015bb (diff) | |
| parent | 82d6897fefca6206bca7153805b4c5359ce97fc4 (diff) | |
Merge branch 'master'
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> |