rpms/kernel/devel config-powerpc-generic, 1.25, 1.26 config-powerpc32-generic, 1.22, 1.23 config-powerpc64, 1.22, 1.23 kernel.spec, 1.1027, 1.1028

[Dave Jones]

Author: davej

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19595

Modified Files:
	config-powerpc-generic config-powerpc32-generic 
	config-powerpc64 kernel.spec 
Log Message:
Reenable a bunch of PPC config options that broke earlier.


Index: config-powerpc-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-powerpc-generic,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- config-powerpc-generic	28 Jul 2008 08:37:10 -0000	1.25
+++ config-powerpc-generic	8 Oct 2008 19:26:22 -0000	1.26
@@ -223,10 +223,7 @@
 
 CONFIG_SND_PPC=y
 
-# BORKED.
-# arch/powerpc/platforms/82xx/ep8248e.c:129: undefined reference to `alloc_mdio_bitbang'
-# arch/powerpc/platforms/82xx/ep8248e.c:143: undefined reference to `mdiobus_register'
-# CONFIG_PPC_82xx is not set
+CONFIG_PPC_82xx=y
 CONFIG_PPC_83xx=y
 CONFIG_PPC_86xx=y
 CONFIG_EXTRA_TARGETS=""
@@ -256,6 +253,3 @@
 CONFIG_SERIO_XILINX_XPS_PS2=m
 
 # CONFIG_PPC_SMLPAR is not set
-
-# drivers/isdn/hardware/mISDN/hfcmulti.c:5255:2: error: #error "not running on big endian machines now"
-# CONFIG_MISDN_HFCMULTI is not set


Index: config-powerpc32-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-powerpc32-generic,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- config-powerpc32-generic	6 Sep 2008 08:29:17 -0000	1.22
+++ config-powerpc32-generic	8 Oct 2008 19:26:22 -0000	1.23
@@ -168,13 +168,10 @@
 CONFIG_MPC8610_HPCD=y
 
 CONFIG_83xx_WDT=m
-
-# busted in .27rc2git6
-# drivers/watchdog/mpc8xxx_wdt.c:304: error: redefinition of 'init_module'
-# drivers/watchdog/mpc8xxx_wdt.c:298: error: previous definition of 'init_module' was here
-# CONFIG_8xxx_WDT is not set
+CONFIG_8xxx_WDT=m
 
 # CONFIG_USB_MUSB_HDRC is not set
 
-# broke build at 305/308
-# CONFIG_MTD_NAND_FSL_UPM is not set
+CONFIG_MTD_SBC8240=m
+CONFIG_MTD_NAND_FSL_UPM=m
+


Index: config-powerpc64
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-powerpc64,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- config-powerpc64	9 Sep 2008 20:29:59 -0000	1.22
+++ config-powerpc64	8 Oct 2008 19:26:22 -0000	1.23
@@ -175,6 +175,3 @@
 CONFIG_PPC_IBM_CELL_POWERBUTTON=m
 CONFIG_CBE_CPUFREQ_SPU_GOVERNOR=m
 
-# Causes an ICE.
-# drivers/net/wireless/ath9k/hw.c:4925: internal compiler error: in expand_expr_real_1, at expr.c:9199
-# CONFIG_ATH9K is not set


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1027
retrieving revision 1.1028
diff -u -r1.1027 -r1.1028
--- kernel.spec	8 Oct 2008 17:58:49 -0000	1.1027
+++ kernel.spec	8 Oct 2008 19:26:22 -0000	1.1028
@@ -1801,6 +1801,9 @@
 
 %changelog
 * Wed Oct 08 2008 Dave Jones <davej at redhat.com>
+- Reenable a bunch of PPC config options that broke earlier.
+
+* Wed Oct 08 2008 Dave Jones <davej at redhat.com>
 - Fix DEBUG_SHIRQ problem in tulip driver.  (#454575)
 
 * Wed Oct 08 2008 Dave Jones <davej at redhat.com>