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/include/asm/tile-desc.h | |
| 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/include/asm/tile-desc.h')
| -rw-r--r-- | arch/tile/include/asm/tile-desc.h | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/arch/tile/include/asm/tile-desc.h b/arch/tile/include/asm/tile-desc.h new file mode 100644 index 000000000000..43849bf79dcb --- /dev/null +++ b/arch/tile/include/asm/tile-desc.h @@ -0,0 +1,19 @@ +/* + * Copyright 2011 Tilera Corporation. All Rights Reserved. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation, version 2. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE, GOOD TITLE or + * NON INFRINGEMENT. See the GNU General Public License for + * more details. + */ + +#ifndef __tilegx__ +#include <asm/tile-desc_32.h> +#else +#include <asm/tile-desc_64.h> +#endif |