diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-13 09:59:14 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-13 09:59:14 -0700 |
| commit | 244dc4e54b73567fae7f8fd9ba56584be9375442 (patch) | |
| tree | c7b47b122fde55c92f7f32797aef1e3e1c7030d1 /arch/m68knommu/kernel/process.c | |
| parent | e7f2f9918c0e97aa98ba147ca387e2c7238f0711 (diff) | |
| parent | e758936e02700ff88a0b08b722a3847b95283ef2 (diff) | |
| download | kernel_samsung_smdk4412-244dc4e54b73567fae7f8fd9ba56584be9375442.tar.gz kernel_samsung_smdk4412-244dc4e54b73567fae7f8fd9ba56584be9375442.tar.bz2 kernel_samsung_smdk4412-244dc4e54b73567fae7f8fd9ba56584be9375442.zip | |
Merge git://git.infradead.org/users/dwmw2/random-2.6
* git://git.infradead.org/users/dwmw2/random-2.6:
Fix autoloading of MacBook Pro backlight driver.
Automatic MODULE_ALIAS() for DMI match tables.
Remove asm/a.out.h files for all architectures without a.out support.
Introduce HAVE_AOUT symbol to remove hard-coded arch list for BINFMT_AOUT
Remove redundant CONFIG_ARCH_SUPPORTS_AOUT
S390: Update comments about why we don't use <asm-generic/statfs.h>
SPARC: Use <asm-generic/statfs.h>
PowerPC: Use <asm-generic/statfs.h>
PARISC: Use <asm-generic/statfs.h>
x86_64: Use <asm-generic/statfs.h>
IA64: Use <asm-generic/statfs.h>
ARM: Use <asm-generic/statfs.h>
Make <asm-generic/statfs.h> suitable for 64-bit platforms.
Define and use PCI_DEVICE_ID_MARVELL_88ALP01_CCIC for CAFÉ camera driver
[MTD] [NAND] Define and use PCI_DEVICE_ID_MARVELL_88ALP01_NAND for CAFÉ
Use PCI_DEVICE_ID_88ALP01 for CAFÉ chip, rather than PCI_DEVICE_ID_CAFE.
EFS: Don't set f_fsid in statfs().
Diffstat (limited to 'arch/m68knommu/kernel/process.c')
| -rw-r--r-- | arch/m68knommu/kernel/process.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/m68knommu/kernel/process.c b/arch/m68knommu/kernel/process.c index 47502d5ec19..3f2d7745f31 100644 --- a/arch/m68knommu/kernel/process.c +++ b/arch/m68knommu/kernel/process.c @@ -25,7 +25,6 @@ #include <linux/ptrace.h> #include <linux/slab.h> #include <linux/user.h> -#include <linux/a.out.h> #include <linux/interrupt.h> #include <linux/reboot.h> #include <linux/fs.h> |