Commit 16f62a50 authored by Greg Banks's avatar Greg Banks Committed by Linus Torvalds

[PATCH] PATCH 2.5: kconfig synchronise banners (10_16)

2/6 definitions of CONFIG_PCI have trivially different banners.
parent beacd116
...@@ -27,7 +27,7 @@ define_bool CONFIG_GSC y ...@@ -27,7 +27,7 @@ define_bool CONFIG_GSC y
bool 'U2/Uturn I/O MMU' CONFIG_IOMMU_CCIO y bool 'U2/Uturn I/O MMU' CONFIG_IOMMU_CCIO y
bool 'LASI I/O support' CONFIG_GSC_LASI y bool 'LASI I/O support' CONFIG_GSC_LASI y
bool 'PCI bus support' CONFIG_PCI y bool 'PCI support' CONFIG_PCI y
if [ "$CONFIG_PCI" = "y" ]; then if [ "$CONFIG_PCI" = "y" ]; then
bool 'GSCtoPCI/DINO PCI support' CONFIG_GSC_DINO y bool 'GSCtoPCI/DINO PCI support' CONFIG_GSC_DINO y
......
...@@ -311,7 +311,7 @@ define_bool CONFIG_SBUS n ...@@ -311,7 +311,7 @@ define_bool CONFIG_SBUS n
define_bool CONFIG_MCA n define_bool CONFIG_MCA n
if [ "$CONFIG_4xx" = "y" -o "$CONFIG_8260" = "y" ]; then if [ "$CONFIG_4xx" = "y" -o "$CONFIG_8260" = "y" ]; then
bool "Enable PCI" CONFIG_PCI bool "PCI support" CONFIG_PCI
bool 'PC PS/2 style Keyboard' CONFIG_PC_KEYBOARD bool 'PC PS/2 style Keyboard' CONFIG_PC_KEYBOARD
else else
if [ "$CONFIG_8xx" = "y" ]; then if [ "$CONFIG_8xx" = "y" ]; then
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment