diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-12 13:15:17 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-12 13:15:17 -0700 |
| commit | 02a99ed6207e9a1d787bb360ef97de023c7edf4a (patch) | |
| tree | f5818df7dd3f3741d02afbdd4271deed48c41f3d /drivers/block | |
| parent | 2b10dc45d15150434d7f206264e912eacbff734b (diff) | |
| parent | 3447ef29a7f3b1fd0d8d58376950e695e04f6f8b (diff) | |
| download | linux-02a99ed6207e9a1d787bb360ef97de023c7edf4a.tar.gz linux-02a99ed6207e9a1d787bb360ef97de023c7edf4a.tar.bz2 linux-02a99ed6207e9a1d787bb360ef97de023c7edf4a.zip | |
Merge branch 'for-linus' of git://git.monstr.eu/linux-2.6-microblaze
* 'for-linus' of git://git.monstr.eu/linux-2.6-microblaze: (55 commits)
microblaze: Don't use access_ok for unaligned
microblaze: remove unused flat_stack_align() definition
microblaze: Fix problem with early_printk in startup
microblaze_mmu_v2: Makefiles
microblaze_mmu_v2: Kconfig update
microblaze_mmu_v2: stat.h MMU update
microblaze_mmu_v2: Elf update
microblaze_mmu_v2: Update dma.h for MMU
microblaze_mmu_v2: Update cacheflush.h
microblaze_mmu_v2: Update signal returning address
microblaze_mmu_v2: Traps MMU update
microblaze_mmu_v2: Enable fork syscall for MMU and add fork as vfork for noMMU
microblaze_mmu_v2: Update linker script for MMU
microblaze_mmu_v2: Add MMU related exceptions handling
microblaze_mmu_v2: uaccess MMU update
microblaze_mmu_v2: Update exception handling - MMU exception
microblaze_mmu_v2: entry.S, entry.h
microblaze_mmu_v2: Add CURRENT_TASK for entry.S
microblaze_mmu_v2: MMU asm offset update
microblaze_mmu_v2: Update tlb.h and tlbflush.h
...
Diffstat (limited to 'drivers/block')
| -rw-r--r-- | drivers/block/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/block/Kconfig b/drivers/block/Kconfig index f42fa50d3550..ac5e05a98b2f 100644 --- a/drivers/block/Kconfig +++ b/drivers/block/Kconfig @@ -438,7 +438,7 @@ source "drivers/s390/block/Kconfig" config XILINX_SYSACE tristate "Xilinx SystemACE support" - depends on 4xx + depends on 4xx || MICROBLAZE help Include support for the Xilinx SystemACE CompactFlash interface |