[Linux-mips-commits]CVS: linux/arch/mips/vr4111/clio-1000 setup.c,1.2,1.3

[Jim P. <jim...@us...>]

Update of /cvsroot/linux-mips/linux/arch/mips/vr4111/clio-1000
In directory usw-pr-cvs1:/tmp/cvs-serv1265/vr4111/clio-1000

Modified Files:
	setup.c 
Log Message:
- Removed <asm/power.h> dependency
- Added CONFIG_IDE and CONFIG_PCMCIA blocks to vr4111/clio-1000/setup.c


Index: setup.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/vr4111/clio-1000/setup.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- setup.c	2001/11/26 19:57:39	1.2
+++ setup.c	2001/11/27 01:16:41	1.3
@@ -19,7 +19,9 @@
 
 #include <linux/config.h>
 #include <linux/console.h>
+#ifdef CONFIG_IDE
 #include <linux/ide.h>
+#endif
 #include <linux/init.h>
 #include <linux/delay.h>
 #include <asm/time.h>
@@ -33,14 +35,18 @@
 extern void vr4111_time_init(void);
 extern void vr4111_timer_setup(void);
 
+#ifdef CONFIG_IDE
 extern struct ide_ops std_ide_ops;
+#endif
 
+#ifdef CONFIG_PCMCIA
 void __init put_cf_reg(unsigned char reg, unsigned char val)
 {
 	/* PCMCIA controller (VG469) is mapped here */
 	outb(reg, 0x3e0);
 	outb(val, 0x3e1);
 }
+#endif
 
 void __init clio_1000_setup(void)
 {
@@ -57,17 +63,21 @@
 	_machine_power_off = vr4111_hibernate;
 	cpu_wait = vr4111_wait;
 
+#ifdef CONFIG_IDE
 	ide_ops = &std_ide_ops;
+#endif
 
 #ifdef CONFIG_FB
 	conswitchp = &dummy_con;
 #endif
 
+#ifdef CONFIG_PCMCIA
 	/* Reset the PCMCIA and CF and power them off */
 	put_cf_reg(0x03, 0x20);   /* Socket 0 */
 	put_cf_reg(0x43, 0x20);   /* Socket 1 */
 	put_cf_reg(0x02, 0x00);   /* Socket 0 */
 	put_cf_reg(0x42, 0x00);   /* Socket 1 */
+#endif
 
 	/* Clio-specific RS232 enable */
 	*VR41XX_GIUPODATL |= VR41XX_GIUPODATL_GPIO42;