Commit b9438745 authored by Linus Torvalds's avatar Linus Torvalds

Make G5 defconfig a bit saner. In particular, we want firewire

and we do _not_ want the broken MACZILOG serial driver.
parent 6a94c129
...@@ -286,7 +286,7 @@ CONFIG_DM_IOCTL_V4=y ...@@ -286,7 +286,7 @@ CONFIG_DM_IOCTL_V4=y
# #
# IEEE 1394 (FireWire) support (EXPERIMENTAL) # IEEE 1394 (FireWire) support (EXPERIMENTAL)
# #
CONFIG_IEEE1394=m CONFIG_IEEE1394=y
# #
# Subsystem Options # Subsystem Options
...@@ -298,7 +298,7 @@ CONFIG_IEEE1394_OUI_DB=y ...@@ -298,7 +298,7 @@ CONFIG_IEEE1394_OUI_DB=y
# Device Drivers # Device Drivers
# #
# CONFIG_IEEE1394_PCILYNX is not set # CONFIG_IEEE1394_PCILYNX is not set
CONFIG_IEEE1394_OHCI1394=m CONFIG_IEEE1394_OHCI1394=y
# #
# Protocol Drivers # Protocol Drivers
...@@ -308,7 +308,7 @@ CONFIG_IEEE1394_SBP2=m ...@@ -308,7 +308,7 @@ CONFIG_IEEE1394_SBP2=m
# CONFIG_IEEE1394_SBP2_PHYS_DMA is not set # CONFIG_IEEE1394_SBP2_PHYS_DMA is not set
CONFIG_IEEE1394_ETH1394=m CONFIG_IEEE1394_ETH1394=m
CONFIG_IEEE1394_DV1394=m CONFIG_IEEE1394_DV1394=m
CONFIG_IEEE1394_RAWIO=m CONFIG_IEEE1394_RAWIO=y
# CONFIG_IEEE1394_CMP is not set # CONFIG_IEEE1394_CMP is not set
# #
...@@ -554,10 +554,7 @@ CONFIG_HW_CONSOLE=y ...@@ -554,10 +554,7 @@ CONFIG_HW_CONSOLE=y
# #
# Non-8250 serial port support # Non-8250 serial port support
# #
CONFIG_SERIAL_CORE=y # CONFIG_SERIAL_PMACZILOG is not set
CONFIG_SERIAL_CORE_CONSOLE=y
CONFIG_SERIAL_PMACZILOG=y
CONFIG_SERIAL_PMACZILOG_CONSOLE=y
CONFIG_UNIX98_PTYS=y CONFIG_UNIX98_PTYS=y
CONFIG_UNIX98_PTY_COUNT=256 CONFIG_UNIX98_PTY_COUNT=256
CONFIG_HVC_CONSOLE=y CONFIG_HVC_CONSOLE=y
...@@ -676,7 +673,9 @@ CONFIG_FB_OF=y ...@@ -676,7 +673,9 @@ CONFIG_FB_OF=y
# CONFIG_FB_VGA16 is not set # CONFIG_FB_VGA16 is not set
CONFIG_FB_RIVA=y CONFIG_FB_RIVA=y
# CONFIG_FB_MATROX is not set # CONFIG_FB_MATROX is not set
# CONFIG_FB_RADEON_OLD is not set
CONFIG_FB_RADEON=y CONFIG_FB_RADEON=y
CONFIG_FB_RADEON_I2C=y
# CONFIG_FB_ATY128 is not set # CONFIG_FB_ATY128 is not set
# CONFIG_FB_ATY is not set # CONFIG_FB_ATY is not set
# CONFIG_FB_SIS is not set # CONFIG_FB_SIS is not set
......
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