diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-07 15:00:25 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-07 15:00:25 -0500 |
| commit | 5bb47b9ff3d16d40f8d45380b373497a545fa280 (patch) | |
| tree | e13dd34395473342dc75eff5cbaf5b1ea753631c /arch/blackfin/configs/H8606_defconfig | |
| parent | 2f2408a88cf8fa43febfd7fb5783e61b2937b0f9 (diff) | |
| parent | 06af15e086e39a5a2a2413973a64af8e10122f28 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/blackfin-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/blackfin-2.6: (171 commits)
Blackfin arch: fix bug - BF527 0.2 silicon has different CPUID (DSPID) value
Blackfin arch: Enlarge flash partition for kenel for bf533/bf537 boards
Blackfin arch: fix bug: kernel crash when enable SDIO host driver
Blackfin arch: Print FP at level KERN_NOTICE
Blackfin arch: drop ad73311 test code
Blackfin arch: update board default configs
Blackfin arch: Set PB4 as the default irq for bf548 board v1.4+.
Blackfin arch: fix typo in early printk bit size processing
Blackfin arch: enable reprogram cclk and sclk for bf518f-ezbrd
Blackfin arch: add SDIO host driver platform data
Blackfin arch: fix bug - kernel stops at initial console
Blackfin arch: fix bug - kernel crash after config IP for ethernet port
Blackfin arch: add sdh support for bf518f-ezbrd
Blackfin arch: fix bug - kernel detects BF532 incorrectly
Blackfin arch: add () to avoid warnings from gcc
Blackfin arch: change HWTRACE Kconfig and set it on default
Blackfin arch: Clean oprofile build path for blackfin
Blackfin arch: remove hardware PM code, oprofile not use it
Blackfin arch: rewrite get_sclk()/get_vco()
Blackfin arch: cleanup and unify the ins functions
...
Diffstat (limited to 'arch/blackfin/configs/H8606_defconfig')
| -rw-r--r-- | arch/blackfin/configs/H8606_defconfig | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/blackfin/configs/H8606_defconfig b/arch/blackfin/configs/H8606_defconfig index 1fc31f1b762b..5d3901d23fd1 100644 --- a/arch/blackfin/configs/H8606_defconfig +++ b/arch/blackfin/configs/H8606_defconfig | |||
| @@ -54,7 +54,7 @@ CONFIG_KALLSYMS=y | |||
| 54 | CONFIG_HOTPLUG=y | 54 | CONFIG_HOTPLUG=y |
| 55 | CONFIG_PRINTK=y | 55 | CONFIG_PRINTK=y |
| 56 | CONFIG_BUG=y | 56 | CONFIG_BUG=y |
| 57 | CONFIG_ELF_CORE=y | 57 | # CONFIG_ELF_CORE is not set |
| 58 | CONFIG_BASE_FULL=y | 58 | CONFIG_BASE_FULL=y |
| 59 | CONFIG_FUTEX=y | 59 | CONFIG_FUTEX=y |
| 60 | CONFIG_ANON_INODES=y | 60 | CONFIG_ANON_INODES=y |
| @@ -250,7 +250,6 @@ CONFIG_SPLIT_PTLOCK_CPUS=4 | |||
| 250 | CONFIG_ZONE_DMA_FLAG=1 | 250 | CONFIG_ZONE_DMA_FLAG=1 |
| 251 | CONFIG_LARGE_ALLOCS=y | 251 | CONFIG_LARGE_ALLOCS=y |
| 252 | CONFIG_BFIN_GPTIMERS=y | 252 | CONFIG_BFIN_GPTIMERS=y |
| 253 | CONFIG_BFIN_DMA_5XX=y | ||
| 254 | # CONFIG_DMA_UNCACHED_2M is not set | 253 | # CONFIG_DMA_UNCACHED_2M is not set |
| 255 | CONFIG_DMA_UNCACHED_1M=y | 254 | CONFIG_DMA_UNCACHED_1M=y |
| 256 | # CONFIG_DMA_UNCACHED_NONE is not set | 255 | # CONFIG_DMA_UNCACHED_NONE is not set |