diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-07-06 14:05:57 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-07-06 14:05:57 -0700 |
| commit | f560902c2d39c255bd67c0211f5dd80edb97a712 (patch) | |
| tree | c45601159db0808e76c78212c74885cd219b2866 /arch/microblaze/include/asm/bug.h | |
| parent | 9861df15f44d98eb6fa9a839b558633ecee87194 (diff) | |
| parent | db6e3f91efd2cf61b9965f722902199cf54adc4f (diff) | |
| download | talos-op-linux-f560902c2d39c255bd67c0211f5dd80edb97a712.tar.gz talos-op-linux-f560902c2d39c255bd67c0211f5dd80edb97a712.zip | |
Merge branch 'fixes-for-linus' of git://git.monstr.eu/linux-2.6-microblaze
* 'fixes-for-linus' of git://git.monstr.eu/linux-2.6-microblaze:
microblaze: Fix cast warning for init.c
microblaze: Wire up new syscalls
microblaze: use generic syscalls.h
microblaze: clean up signal handling
microblaze: convert all simple headers to use asm-generic
microblaze: use the generic lib/checksum.c
microblaze: fall back on generic header files for the ABI
Diffstat (limited to 'arch/microblaze/include/asm/bug.h')
| -rw-r--r-- | arch/microblaze/include/asm/bug.h | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/arch/microblaze/include/asm/bug.h b/arch/microblaze/include/asm/bug.h index 8eb2cdde11d7..b12fd89e42e9 100644 --- a/arch/microblaze/include/asm/bug.h +++ b/arch/microblaze/include/asm/bug.h @@ -1,15 +1 @@ -/* - * Copyright (C) 2006 Atmark Techno, Inc. - * - * This file is subject to the terms and conditions of the GNU General Public - * License. See the file "COPYING" in the main directory of this archive - * for more details. - */ - -#ifndef _ASM_MICROBLAZE_BUG_H -#define _ASM_MICROBLAZE_BUG_H - -#include <linux/kernel.h> #include <asm-generic/bug.h> - -#endif /* _ASM_MICROBLAZE_BUG_H */ |
