diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-07 18:07:33 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-07 18:07:33 -0700 |
| commit | 3d8cd0c5d75c424f986c0602dc26579fbb7c8080 (patch) | |
| tree | 03c61f81542f6c34e32eb5e0dfc3d34668f88fdd /arch/m68knommu/include/asm/bug.h | |
| parent | 4c514a5ad1314b872e3185dabaf105c81d39d7e8 (diff) | |
| parent | 58750139001bae11a1f9b074f3a9c774fecf5ba8 (diff) | |
| download | linux-next-3d8cd0c5d75c424f986c0602dc26579fbb7c8080.tar.gz | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
Move all of include/asm-m68knommu to arch/m68knommu/include/asm.
Diffstat (limited to 'arch/m68knommu/include/asm/bug.h')
| -rw-r--r-- | arch/m68knommu/include/asm/bug.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/m68knommu/include/asm/bug.h b/arch/m68knommu/include/asm/bug.h new file mode 100644 index 000000000000..70e7dc0af21a --- /dev/null +++ b/arch/m68knommu/include/asm/bug.h @@ -0,0 +1,4 @@ +#ifndef _M68KNOMMU_BUG_H +#define _M68KNOMMU_BUG_H +#include <asm-generic/bug.h> +#endif |