diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2008-09-04 11:08:42 -0400 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2008-09-04 11:08:42 -0400 |
| commit | 7203781c98ad9147564d327de6f6513ad8fc0f4e (patch) | |
| tree | 5c29a2a04a626bf08a0d56fd8a0068b3c92ad284 /arch/blackfin/mach-bf533/boards/Kconfig | |
| parent | 671eef85a3e885dff4ce210d8774ad50a91d5967 (diff) | |
| parent | af2e1f276ff08f17192411ea3b71c13a758dfe12 (diff) | |
Merge branch 'x86/cpu' into x86/core
Conflicts:
arch/x86/kernel/cpu/feature_names.c
include/asm-x86/cpufeature.h
Diffstat (limited to 'arch/blackfin/mach-bf533/boards/Kconfig')
| -rw-r--r-- | arch/blackfin/mach-bf533/boards/Kconfig | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/blackfin/mach-bf533/boards/Kconfig b/arch/blackfin/mach-bf533/boards/Kconfig index 840059241fbe..308c98dc5aba 100644 --- a/arch/blackfin/mach-bf533/boards/Kconfig +++ b/arch/blackfin/mach-bf533/boards/Kconfig | |||
| @@ -14,6 +14,12 @@ config BFIN533_STAMP | |||
| 14 | help | 14 | help |
| 15 | BF533-STAMP board support. | 15 | BF533-STAMP board support. |
| 16 | 16 | ||
| 17 | config BLACKSTAMP | ||
| 18 | bool "BlackStamp" | ||
| 19 | help | ||
| 20 | Support for the BlackStamp board. Hardware info available at | ||
| 21 | http://blackfin.uclinux.org/gf/project/blackstamp/ | ||
| 22 | |||
| 17 | config BFIN533_BLUETECHNIX_CM | 23 | config BFIN533_BLUETECHNIX_CM |
| 18 | bool "Bluetechnix CM-BF533" | 24 | bool "Bluetechnix CM-BF533" |
| 19 | depends on (BF533) | 25 | depends on (BF533) |