diff options
author | Paul Mackerras <paulus@samba.org> | 2007-08-28 01:56:11 -0400 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2007-08-28 01:56:11 -0400 |
commit | 35438c4327df18dbf5e7f597b69299119f4a14de (patch) | |
tree | a4589d731015db93f2eba8f84ffb1f48a8084020 /arch/powerpc/platforms/Kconfig | |
parent | 2f6c9d961081dc7b109eb19166244bcb2a5dfc28 (diff) | |
parent | b07d68b5ca4d55a16fab223d63d5fb36f89ff42f (diff) |
Merge branch 'linux-2.6' into for-2.6.24
Diffstat (limited to 'arch/powerpc/platforms/Kconfig')
-rw-r--r-- | arch/powerpc/platforms/Kconfig | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/powerpc/platforms/Kconfig b/arch/powerpc/platforms/Kconfig index 2c937fb207fe..041df77ec117 100644 --- a/arch/powerpc/platforms/Kconfig +++ b/arch/powerpc/platforms/Kconfig | |||
@@ -283,4 +283,12 @@ config AXON_RAM | |||
283 | minor numbers are available in /proc/devices, /proc/partitions or | 283 | minor numbers are available in /proc/devices, /proc/partitions or |
284 | in /sys/block/axonram?/dev. | 284 | in /sys/block/axonram?/dev. |
285 | 285 | ||
286 | config FSL_ULI1575 | ||
287 | bool | ||
288 | default n | ||
289 | help | ||
290 | Supports for the ULI1575 PCIe south bridge that exists on some | ||
291 | Freescale reference boards. The boards all use the ULI in pretty | ||
292 | much the same way. | ||
293 | |||
286 | endmenu | 294 | endmenu |