diff options
| author | Jody McIntyre <scjody@modernduck.com> | 2006-03-28 20:24:39 -0500 |
|---|---|---|
| committer | Jody McIntyre <scjody@modernduck.com> | 2006-03-28 20:24:39 -0500 |
| commit | c0e4077c946104e5d8a62f835dcdca5c79c8af7d (patch) | |
| tree | c1f458722f86690a6172bbac2dfef3241ba0ec7e /arch/i386/kernel/setup.c | |
| parent | 94c2d01a537daf51a9fcf229d7d2204c979355d9 (diff) | |
| parent | ca9ba4471c1203bb6e759b76e83167fec54fe590 (diff) | |
Merge with git+ssh://master.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'arch/i386/kernel/setup.c')
| -rw-r--r-- | arch/i386/kernel/setup.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/i386/kernel/setup.c b/arch/i386/kernel/setup.c index 6917daa159ab..8c08660b4e5d 100644 --- a/arch/i386/kernel/setup.c +++ b/arch/i386/kernel/setup.c | |||
| @@ -46,6 +46,7 @@ | |||
| 46 | #include <linux/kexec.h> | 46 | #include <linux/kexec.h> |
| 47 | #include <linux/crash_dump.h> | 47 | #include <linux/crash_dump.h> |
| 48 | #include <linux/dmi.h> | 48 | #include <linux/dmi.h> |
| 49 | #include <linux/pfn.h> | ||
| 49 | 50 | ||
| 50 | #include <video/edid.h> | 51 | #include <video/edid.h> |
| 51 | 52 | ||