diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-04 12:33:34 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-04 12:33:34 -0700 |
| commit | 1583171492eb514e267c7b51e96846b38de0f544 (patch) | |
| tree | a417007b9140e3b497e31fd21889abed410a442d /arch/tile/kernel/module.c | |
| parent | 6736c047995c560b73f3860095c631456b0bbea8 (diff) | |
| parent | eb7c792da5afa3b9ec3e802c30952f82d2e9722b (diff) | |
Merge branch 'for-linus' of git://github.com/cmetcalf-tilera/linux-tile
* 'for-linus' of git://github.com/cmetcalf-tilera/linux-tile:
arch/tile: factor out <arch/opcode.h> header
arch/tile: add the <arch> headers to the set of installed kernel headers
arch/tile: avoid exporting a symbol no longer used by gcc
arch/tile: avoid ISO namespace pollution with <asm/sigcontext.h>
Diffstat (limited to 'arch/tile/kernel/module.c')
| -rw-r--r-- | arch/tile/kernel/module.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/tile/kernel/module.c b/arch/tile/kernel/module.c index 28fa6ece9d3..b90ab992567 100644 --- a/arch/tile/kernel/module.c +++ b/arch/tile/kernel/module.c @@ -20,9 +20,9 @@ #include <linux/fs.h> #include <linux/string.h> #include <linux/kernel.h> -#include <asm/opcode-tile.h> #include <asm/pgtable.h> #include <asm/homecache.h> +#include <arch/opcode.h> #ifdef __tilegx__ # define Elf_Rela Elf64_Rela |