Commit d1c0dfc8 authored by Linus Torvalds's avatar Linus Torvalds

Merge ppc970:v2.5/linux into home.osdl.org:/home/torvalds/v2.5/linux

parents bb49d1d1 b9438745
......@@ -286,7 +286,7 @@ CONFIG_DM_IOCTL_V4=y
#
# IEEE 1394 (FireWire) support (EXPERIMENTAL)
#
CONFIG_IEEE1394=m
CONFIG_IEEE1394=y
#
# Subsystem Options
......@@ -298,7 +298,7 @@ CONFIG_IEEE1394_OUI_DB=y
# Device Drivers
#
# CONFIG_IEEE1394_PCILYNX is not set
CONFIG_IEEE1394_OHCI1394=m
CONFIG_IEEE1394_OHCI1394=y
#
# Protocol Drivers
......@@ -308,7 +308,7 @@ CONFIG_IEEE1394_SBP2=m
# CONFIG_IEEE1394_SBP2_PHYS_DMA is not set
CONFIG_IEEE1394_ETH1394=m
CONFIG_IEEE1394_DV1394=m
CONFIG_IEEE1394_RAWIO=m
CONFIG_IEEE1394_RAWIO=y
# CONFIG_IEEE1394_CMP is not set
#
......@@ -554,10 +554,7 @@ CONFIG_HW_CONSOLE=y
#
# Non-8250 serial port support
#
CONFIG_SERIAL_CORE=y
CONFIG_SERIAL_CORE_CONSOLE=y
CONFIG_SERIAL_PMACZILOG=y
CONFIG_SERIAL_PMACZILOG_CONSOLE=y
# CONFIG_SERIAL_PMACZILOG is not set
CONFIG_UNIX98_PTYS=y
CONFIG_UNIX98_PTY_COUNT=256
CONFIG_HVC_CONSOLE=y
......@@ -676,7 +673,9 @@ CONFIG_FB_OF=y
# CONFIG_FB_VGA16 is not set
CONFIG_FB_RIVA=y
# CONFIG_FB_MATROX is not set
# CONFIG_FB_RADEON_OLD is not set
CONFIG_FB_RADEON=y
CONFIG_FB_RADEON_I2C=y
# CONFIG_FB_ATY128 is not set
# CONFIG_FB_ATY is not set
# CONFIG_FB_SIS is not set
......
......@@ -208,7 +208,7 @@ bad_page_fault(struct pt_regs *regs, unsigned long address, int sig)
/* kernel has accessed a bad area */
#ifdef CONFIG_DEBUG_KERNEL
if (debugger_kernel_faults)
if (debugger_kernel_faults && debugger)
debugger(regs);
#endif
die("Kernel access of bad area", regs, sig);
......
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