diff options
| author | Benjamin Herrenschmidt | 2008-10-15 02:31:54 +0200 |
|---|---|---|
| committer | Benjamin Herrenschmidt | 2008-10-15 02:31:54 +0200 |
| commit | 6dc6472581f693b5fc95aebedf67b4960fb85cf0 (patch) | |
| tree | 06a5a9a08519950575505273eabced331ed51405 /arch/powerpc/platforms/powermac | |
| parent | powerpc: Fix CHRP PCI config access for indirect_pci (diff) | |
| parent | Merge branch 'for-2.6.28' of git://linux-nfs.org/~bfields/linux (diff) | |
| download | kernel-qcow2-linux-6dc6472581f693b5fc95aebedf67b4960fb85cf0.tar.gz kernel-qcow2-linux-6dc6472581f693b5fc95aebedf67b4960fb85cf0.tar.xz kernel-qcow2-linux-6dc6472581f693b5fc95aebedf67b4960fb85cf0.zip | |
Merge commit 'origin'
Manual fixup of conflicts on:
arch/powerpc/include/asm/dcr-regs.h
drivers/net/ibm_newemac/core.h
Diffstat (limited to 'arch/powerpc/platforms/powermac')
| -rw-r--r-- | arch/powerpc/platforms/powermac/setup.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/powermac/setup.c b/arch/powerpc/platforms/powermac/setup.c index 88ccf3a08a9c..82c14d203d8b 100644 --- a/arch/powerpc/platforms/powermac/setup.c +++ b/arch/powerpc/platforms/powermac/setup.c @@ -33,7 +33,6 @@ #include <linux/ptrace.h> #include <linux/slab.h> #include <linux/user.h> -#include <linux/a.out.h> #include <linux/tty.h> #include <linux/string.h> #include <linux/delay.h> |