diff options
| author | David Howells <dhowells@redhat.com> | 2006-12-05 12:01:28 -0500 |
|---|---|---|
| committer | David Howells <dhowells@warthog.cambridge.redhat.com> | 2006-12-05 12:01:28 -0500 |
| commit | 9db73724453a9350e1c22dbe732d427e2939a5c9 (patch) | |
| tree | 15e3ead6413ae97398a54292acc199bee0864d42 /arch/m68knommu/kernel/setup.c | |
| parent | 4c1ac1b49122b805adfa4efc620592f68dccf5db (diff) | |
| parent | e62438630ca37539c8cc1553710bbfaa3cf960a7 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
drivers/ata/libata-scsi.c
include/linux/libata.h
Futher merge of Linus's head and compilation fixups.
Signed-Off-By: David Howells <dhowells@redhat.com>
Diffstat (limited to 'arch/m68knommu/kernel/setup.c')
| -rw-r--r-- | arch/m68knommu/kernel/setup.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/m68knommu/kernel/setup.c b/arch/m68knommu/kernel/setup.c index 7b21959eaeae..9cf2e4d1fc77 100644 --- a/arch/m68knommu/kernel/setup.c +++ b/arch/m68knommu/kernel/setup.c | |||
| @@ -36,10 +36,7 @@ | |||
| 36 | #include <asm/setup.h> | 36 | #include <asm/setup.h> |
| 37 | #include <asm/irq.h> | 37 | #include <asm/irq.h> |
| 38 | #include <asm/machdep.h> | 38 | #include <asm/machdep.h> |
| 39 | |||
| 40 | #ifdef CONFIG_BLK_DEV_INITRD | ||
| 41 | #include <asm/pgtable.h> | 39 | #include <asm/pgtable.h> |
| 42 | #endif | ||
| 43 | 40 | ||
| 44 | unsigned long memory_start; | 41 | unsigned long memory_start; |
| 45 | unsigned long memory_end; | 42 | unsigned long memory_end; |