diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-11-01 09:51:51 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-11-01 09:51:51 -0700 |
| commit | 0242909a6135e10a28822c64f9ad50fdad52757c (patch) | |
| tree | c5f9c8abe95a65433e6ac356871f2379c02488fe /include/asm-cris/bug.h | |
| parent | 0a6d2fac615972142715d736289abeeb7382e81d (diff) | |
| parent | 556dcee7b829e5c350c3ffdbdb87a8b15aa3c5d3 (diff) | |
| download | linux-next-0242909a6135e10a28822c64f9ad50fdad52757c.tar.gz linux-next-0242909a6135e10a28822c64f9ad50fdad52757c.zip | |
Merge branch 'cris_move' of git://www.jni.nu/cris
* 'cris_move' of git://www.jni.nu/cris:
[CRIS] Move header files from include to arch/cris/include.
[CRISv32] Remove warning in io.h
Diffstat (limited to 'include/asm-cris/bug.h')
| -rw-r--r-- | include/asm-cris/bug.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/include/asm-cris/bug.h b/include/asm-cris/bug.h deleted file mode 100644 index fee12d4ae683..000000000000 --- a/include/asm-cris/bug.h +++ /dev/null @@ -1,4 +0,0 @@ -#ifndef _CRIS_BUG_H -#define _CRIS_BUG_H -#include <asm/arch/bug.h> -#endif |