diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-23 12:16:56 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-23 12:16:56 -0400 |
commit | 5a439c565799cb8d290d71ce375e86be64d43a4b (patch) | |
tree | b7933dced01add02249af35f5497e77cd11dbfdf /arch/xtensa/Makefile | |
parent | 94b6da5ab8293b04a300ba35c72eddfa94db8b02 (diff) | |
parent | 0025427eee4b5c005b4ac7a6489adc773e38611d (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/czankel/xtensa-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/czankel/xtensa-2.6:
xtensa: Add config files for Diamond 232L - Rev B processor variant
xtensa: Fix io regions
xtensa: Add support for the Sonic Ethernet device for the XT2000 board.
xtensa: replace remaining __FUNCTION__ occurrences
xtensa: use newer __SPIN_LOCK_UNLOCKED macro
XTENSA: warn about including <asm/rwsem.h> directly.
Diffstat (limited to 'arch/xtensa/Makefile')
-rw-r--r-- | arch/xtensa/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/xtensa/Makefile b/arch/xtensa/Makefile index 4bd1e14c6b90..015b6b2a26b9 100644 --- a/arch/xtensa/Makefile +++ b/arch/xtensa/Makefile | |||
@@ -14,6 +14,7 @@ | |||
14 | # (Use VAR=<xtensa_config> to use another default compiler.) | 14 | # (Use VAR=<xtensa_config> to use another default compiler.) |
15 | 15 | ||
16 | variant-$(CONFIG_XTENSA_VARIANT_FSF) := fsf | 16 | variant-$(CONFIG_XTENSA_VARIANT_FSF) := fsf |
17 | variant-$(CONFIG_XTENSA_VARIANT_DC232B) := dc232b | ||
17 | variant-$(CONFIG_XTENSA_VARIANT_LINUX_CUSTOM) := custom | 18 | variant-$(CONFIG_XTENSA_VARIANT_LINUX_CUSTOM) := custom |
18 | 19 | ||
19 | VARIANT = $(variant-y) | 20 | VARIANT = $(variant-y) |