diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-24 12:01:44 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-24 12:01:44 -0400 |
| commit | a6b49cb210f878709bdc0bddc16a853f18790d02 (patch) | |
| tree | 6147078ef0ce584cb6a8dae7468f060ef5838d12 /drivers/mtd | |
| parent | 2c9871de0ae89a0e2c365ea6e277135fe031d8b4 (diff) | |
| parent | bfc8125858d777bd5bdba03a091c07cc2e0e17c0 (diff) | |
Merge branch 'for-linus' of git://git.monstr.eu/linux-2.6-microblaze
* 'for-linus' of git://git.monstr.eu/linux-2.6-microblaze: (24 commits)
microblaze: Disable heartbeat/enable emaclite in defconfigs
microblaze: Support simpleImage.dts make target
microblaze: Fix _start symbol to physical address
microblaze: Use LOAD_OFFSET macro to get correct LMA for all sections
microblaze: Create the LOAD_OFFSET macro used to compute VMA vs LMA offsets
microblaze: Copy ppc asm-compat.h for clean handling of constants in asm and C
microblaze: Actually show KiB rather than pages in "Freeing initrd memory:"
microblaze: Support ptrace syscall tracing.
microblaze: Updated CPU version and FPGA family codes in PVR
microblaze: Generate correct signal and siginfo for integer div-by-zero
microblaze: Don't be noisy when userspace causes hardware exceptions
microblaze: Remove ipc.h file which points to non-existing asm-generic file
microblaze: Clear sticky FSR register after generating exception signals
microblaze: Ensure CPU usermode is set on new userspace processes
microblaze: Use correct kbuild variable KBUILD_CFLAGS
microblaze: Save and restore msr in hw exception
microblaze: Add architectural support for USB EHCI host controllers
microblaze: Implement include/asm/syscall.h.
microblaze: Improve checking mechanism for MSR instruction
microblaze: Add checking mechanism for MSR instruction
...
Diffstat (limited to 'drivers/mtd')
| -rw-r--r-- | drivers/mtd/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/mtd/maps/Kconfig | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mtd/Kconfig b/drivers/mtd/Kconfig index e4ec3659759a..ecf90f5c97c2 100644 --- a/drivers/mtd/Kconfig +++ b/drivers/mtd/Kconfig | |||
| @@ -159,7 +159,7 @@ config MTD_AFS_PARTS | |||
| 159 | 159 | ||
| 160 | config MTD_OF_PARTS | 160 | config MTD_OF_PARTS |
| 161 | tristate "Flash partition map based on OF description" | 161 | tristate "Flash partition map based on OF description" |
| 162 | depends on PPC_OF && MTD_PARTITIONS | 162 | depends on (MICROBLAZE || PPC_OF) && MTD_PARTITIONS |
| 163 | help | 163 | help |
| 164 | This provides a partition parsing function which derives | 164 | This provides a partition parsing function which derives |
| 165 | the partition map from the children of the flash node, | 165 | the partition map from the children of the flash node, |
diff --git a/drivers/mtd/maps/Kconfig b/drivers/mtd/maps/Kconfig index 3a9a960644b6..841e085ab74a 100644 --- a/drivers/mtd/maps/Kconfig +++ b/drivers/mtd/maps/Kconfig | |||
| @@ -74,7 +74,7 @@ config MTD_PHYSMAP_BANKWIDTH | |||
| 74 | 74 | ||
| 75 | config MTD_PHYSMAP_OF | 75 | config MTD_PHYSMAP_OF |
| 76 | tristate "Flash device in physical memory map based on OF description" | 76 | tristate "Flash device in physical memory map based on OF description" |
| 77 | depends on PPC_OF && (MTD_CFI || MTD_JEDECPROBE || MTD_ROM) | 77 | depends on (MICROBLAZE || PPC_OF) && (MTD_CFI || MTD_JEDECPROBE || MTD_ROM) |
| 78 | help | 78 | help |
| 79 | This provides a 'mapping' driver which allows the NOR Flash and | 79 | This provides a 'mapping' driver which allows the NOR Flash and |
| 80 | ROM driver code to communicate with chips which are mapped | 80 | ROM driver code to communicate with chips which are mapped |