patch-2.1.129 linux/arch/ppc/kernel/prep_setup.c

Next file: linux/arch/ppc/kernel/process.c
Previous file: linux/arch/ppc/kernel/prep_pci.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.128/linux/arch/ppc/kernel/prep_setup.c linux/arch/ppc/kernel/prep_setup.c
@@ -196,7 +196,7 @@
         sprintf(cmd_line,"%s console=tty0 console=ttyS0,9600n8", cmd_line);
 	printk("Boot arguments: %s\n", cmd_line);
 	
-#ifdef CONFIG_CS4232
+#ifdef CONFIG_SOUND_CS4232
 	/*
 	 * setup proper values for the cs4232 driver so we don't have
 	 * to recompile for the motorola or ibm workstations sound systems.
@@ -233,8 +233,7 @@
 			}
 		}
 	}
-#endif /* CONFIG_CS4232 */	
-	
+#endif /* CONFIG_SOUND_CS4232 */	
 
 	/*print_residual_device_info();*/
         request_region(0x20,0x20,"pic1");

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov