diff options
-rw-r--r-- | arch/powerpc/platforms/85xx/Kconfig | 1 | ||||
-rw-r--r-- | arch/powerpc/platforms/Kconfig | 5 |
2 files changed, 0 insertions, 6 deletions
diff --git a/arch/powerpc/platforms/85xx/Kconfig b/arch/powerpc/platforms/85xx/Kconfig index cccc85a65041..291675b0097a 100644 --- a/arch/powerpc/platforms/85xx/Kconfig +++ b/arch/powerpc/platforms/85xx/Kconfig | |||
@@ -86,7 +86,6 @@ config TQM8548 | |||
86 | help | 86 | help |
87 | This option enables support for the TQ Components TQM8548 board. | 87 | This option enables support for the TQ Components TQM8548 board. |
88 | select DEFAULT_UIMAGE | 88 | select DEFAULT_UIMAGE |
89 | select PPC_CPM_NEW_BINDING | ||
90 | select TQM85xx | 89 | select TQM85xx |
91 | 90 | ||
92 | config TQM8555 | 91 | config TQM8555 |
diff --git a/arch/powerpc/platforms/Kconfig b/arch/powerpc/platforms/Kconfig index efe5805eecbe..1d0968775c0a 100644 --- a/arch/powerpc/platforms/Kconfig +++ b/arch/powerpc/platforms/Kconfig | |||
@@ -260,11 +260,6 @@ config CPM2 | |||
260 | you wish to build a kernel for a machine with a CPM2 coprocessor | 260 | you wish to build a kernel for a machine with a CPM2 coprocessor |
261 | on it (826x, 827x, 8560). | 261 | on it (826x, 827x, 8560). |
262 | 262 | ||
263 | config PPC_CPM_NEW_BINDING | ||
264 | bool | ||
265 | depends on CPM1 || CPM2 | ||
266 | default y | ||
267 | |||
268 | config AXON_RAM | 263 | config AXON_RAM |
269 | tristate "Axon DDR2 memory device driver" | 264 | tristate "Axon DDR2 memory device driver" |
270 | depends on PPC_IBM_CELL_BLADE | 265 | depends on PPC_IBM_CELL_BLADE |