diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2009-09-08 20:55:21 -0400 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2009-09-08 20:55:21 -0400 |
| commit | bbb20089a3275a19e475dbc21320c3742e3ca423 (patch) | |
| tree | 216fdc1cbef450ca688135c5b8969169482d9a48 /arch/arm/mach-kirkwood/Kconfig | |
| parent | 3e48e656903e9fd8bc805c6a2c4264d7808d315b (diff) | |
| parent | 657a77fa7284d8ae28dfa48f1dc5d919bf5b2843 (diff) | |
Merge branch 'dmaengine' into async-tx-next
Conflicts:
crypto/async_tx/async_xor.c
drivers/dma/ioat/dma_v2.h
drivers/dma/ioat/pci.c
drivers/md/raid5.c
Diffstat (limited to 'arch/arm/mach-kirkwood/Kconfig')
| -rw-r--r-- | arch/arm/mach-kirkwood/Kconfig | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/mach-kirkwood/Kconfig b/arch/arm/mach-kirkwood/Kconfig index b5421cccd7e1..25100f7acf4c 100644 --- a/arch/arm/mach-kirkwood/Kconfig +++ b/arch/arm/mach-kirkwood/Kconfig | |||
| @@ -20,6 +20,12 @@ config MACH_RD88F6281 | |||
| 20 | Say 'Y' here if you want your kernel to support the | 20 | Say 'Y' here if you want your kernel to support the |
| 21 | Marvell RD-88F6281 Reference Board. | 21 | Marvell RD-88F6281 Reference Board. |
| 22 | 22 | ||
| 23 | config MACH_MV88F6281GTW_GE | ||
| 24 | bool "Marvell 88F6281 GTW GE Board" | ||
| 25 | help | ||
| 26 | Say 'Y' here if you want your kernel to support the | ||
| 27 | Marvell 88F6281 GTW GE Board. | ||
| 28 | |||
| 23 | config MACH_SHEEVAPLUG | 29 | config MACH_SHEEVAPLUG |
| 24 | bool "Marvell SheevaPlug Reference Board" | 30 | bool "Marvell SheevaPlug Reference Board" |
| 25 | help | 31 | help |