diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-09-17 11:32:51 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-09-17 11:32:51 +1000 |
| commit | 01f4ab2fc22192c5a325b95419b46d2e0f040369 (patch) | |
| tree | 8892f8d2bbdd8cd4e9a67fdd2f5b414af48a6d80 /drivers | |
| parent | 613da97b8f02ca84b59bcade7098125f8c04999b (diff) | |
| parent | 2e7e1f3d34fd80e677b36b7150b883c2579c7d69 (diff) | |
Merge commit 'microblaze/next'
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/mtd/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/mtd/maps/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/usb/Kconfig | 1 |
3 files changed, 2 insertions, 3 deletions
diff --git a/drivers/mtd/Kconfig b/drivers/mtd/Kconfig index b8e35a0b4d72..bf1997fd6232 100644 --- a/drivers/mtd/Kconfig +++ b/drivers/mtd/Kconfig @@ -159,7 +159,7 @@ config MTD_AFS_PARTS config MTD_OF_PARTS tristate "Flash partition map based on OF description" - depends on PPC_OF && MTD_PARTITIONS + depends on (MICROBLAZE || PPC_OF) && MTD_PARTITIONS help This provides a partition parsing function which derives the partition map from the children of the flash node, diff --git a/drivers/mtd/maps/Kconfig b/drivers/mtd/maps/Kconfig index 7a58bd5522fd..5b82cd952567 100644 --- a/drivers/mtd/maps/Kconfig +++ b/drivers/mtd/maps/Kconfig @@ -74,7 +74,7 @@ config MTD_PHYSMAP_BANKWIDTH config MTD_PHYSMAP_OF tristate "Flash device in physical memory map based on OF description" - depends on PPC_OF && (MTD_CFI || MTD_JEDECPROBE || MTD_ROM) + depends on (MICROBLAZE || PPC_OF) && (MTD_CFI || MTD_JEDECPROBE || MTD_ROM) help This provides a 'mapping' driver which allows the NOR Flash and ROM driver code to communicate with chips which are mapped diff --git a/drivers/usb/Kconfig b/drivers/usb/Kconfig index dcd49f1e96d0..b35025ae4303 100644 --- a/drivers/usb/Kconfig +++ b/drivers/usb/Kconfig @@ -22,7 +22,6 @@ config USB_ARCH_HAS_HCD default y if PCMCIA && !M32R # sl811_cs default y if ARM # SL-811 default y if SUPERH # r8a66597-hcd - default y if MICROBLAZE default PCI # many non-PCI SOC chips embed OHCI |