diff options
| author | Dave Jones <davej@redhat.com> | 2006-09-05 17:16:33 -0400 |
|---|---|---|
| committer | Dave Jones <davej@redhat.com> | 2006-09-05 17:16:33 -0400 |
| commit | 23e735bc7b0e1d614656881794257b4224efda3a (patch) | |
| tree | d9523b531156fedb204e31b4612519b0a7a003e7 /arch/powerpc/platforms/85xx/Kconfig | |
| parent | 3906f4edeef976c081c4e7bd92164d2f59c325ae (diff) | |
| parent | c336923b668fdcf0312efbec3b44895d713f4d81 (diff) | |
Merge ../linus
Diffstat (limited to 'arch/powerpc/platforms/85xx/Kconfig')
| -rw-r--r-- | arch/powerpc/platforms/85xx/Kconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/85xx/Kconfig b/arch/powerpc/platforms/85xx/Kconfig index 454fc53289ab..c3268d9877e4 100644 --- a/arch/powerpc/platforms/85xx/Kconfig +++ b/arch/powerpc/platforms/85xx/Kconfig | |||
| @@ -14,7 +14,6 @@ config MPC8540_ADS | |||
| 14 | config MPC85xx_CDS | 14 | config MPC85xx_CDS |
| 15 | bool "Freescale MPC85xx CDS" | 15 | bool "Freescale MPC85xx CDS" |
| 16 | select DEFAULT_UIMAGE | 16 | select DEFAULT_UIMAGE |
| 17 | select PPC_I8259 if PCI | ||
| 18 | help | 17 | help |
| 19 | This option enables support for the MPC85xx CDS board | 18 | This option enables support for the MPC85xx CDS board |
| 20 | 19 | ||