diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2010-08-10 13:22:08 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2010-08-10 13:22:08 +0200 |
| commit | fb8231a8b139035476f2a8aaac837d0099b66dad (patch) | |
| tree | 2875806beb96ea0cdab292146767a5085721dc6a /arch/tile/include/asm/spinlock.h | |
| parent | 426d31071ac476ea62c62656b242930c17b58c00 (diff) | |
| parent | f6cec0ae58c17522a7bc4e2f39dae19f199ab534 (diff) | |
| download | op-kernel-dev-fb8231a8b139035476f2a8aaac837d0099b66dad.zip op-kernel-dev-fb8231a8b139035476f2a8aaac837d0099b66dad.tar.gz | |
Merge branch 'master' into for-next
Conflicts:
arch/arm/mach-omap1/board-nokia770.c
Diffstat (limited to 'arch/tile/include/asm/spinlock.h')
| -rw-r--r-- | arch/tile/include/asm/spinlock.h | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/arch/tile/include/asm/spinlock.h b/arch/tile/include/asm/spinlock.h new file mode 100644 index 0000000..1a8bd47 --- /dev/null +++ b/arch/tile/include/asm/spinlock.h @@ -0,0 +1,24 @@ +/* + * Copyright 2010 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 _ASM_TILE_SPINLOCK_H +#define _ASM_TILE_SPINLOCK_H + +#ifdef __tilegx__ +#include <asm/spinlock_64.h> +#else +#include <asm/spinlock_32.h> +#endif + +#endif /* _ASM_TILE_SPINLOCK_H */ |
