diff options
| author | Jens Axboe <jens.axboe@oracle.com> | 2009-05-22 14:25:34 -0400 |
|---|---|---|
| committer | Jens Axboe <jens.axboe@oracle.com> | 2009-05-22 14:25:34 -0400 |
| commit | e4b636366c00738b9609cda307014d71b1225b7f (patch) | |
| tree | 760b67b3624eda62e943e48ce93635c30a5b47bf /arch/powerpc/platforms/44x/Kconfig | |
| parent | b9ed7252d219c1c663944bf03846eabb515dbe75 (diff) | |
| parent | 279e677faa775ad16e75c32e1bf4a37f8158bc61 (diff) | |
Merge branch 'master' into for-2.6.31
Conflicts:
drivers/block/hd.c
drivers/block/mg_disk.c
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Diffstat (limited to 'arch/powerpc/platforms/44x/Kconfig')
| -rw-r--r-- | arch/powerpc/platforms/44x/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/powerpc/platforms/44x/Kconfig b/arch/powerpc/platforms/44x/Kconfig index bf5c7ff2e6e5..0d83a6a0397d 100644 --- a/arch/powerpc/platforms/44x/Kconfig +++ b/arch/powerpc/platforms/44x/Kconfig | |||
| @@ -246,6 +246,7 @@ config IBM440EP_ERR42 | |||
| 246 | # Xilinx specific config options. | 246 | # Xilinx specific config options. |
| 247 | config XILINX_VIRTEX | 247 | config XILINX_VIRTEX |
| 248 | bool | 248 | bool |
| 249 | select DEFAULT_UIMAGE | ||
| 249 | 250 | ||
| 250 | # Xilinx Virtex 5 FXT FPGA architecture, selected by a Xilinx board above | 251 | # Xilinx Virtex 5 FXT FPGA architecture, selected by a Xilinx board above |
| 251 | config XILINX_VIRTEX_5_FXT | 252 | config XILINX_VIRTEX_5_FXT |