[parisc-linux-cvs] 2.5.46-pa2 DIFF kconfig/

[Grant Grundler]

Grant Grundler wrote:
> Modified files:
> 	arch/parisc    : Kconfig 
> 	arch/parisc/kernel: parisc_ksyms.c 
> 	drivers/block  : Makefile ioctl.c 
> 	drivers/parisc : Kconfig 
> 
> Log message:
> fix Kconfigs: IDE does not depend on SuperIO
> Can now link c3k kernel with IDE built-in. IDE won't link as modules.


Index: arch/parisc/Kconfig
===================================================================
RCS file: /var/cvs/linux-2.5/arch/parisc/Kconfig,v
retrieving revision 1.7
diff -u -p -r1.7 Kconfig
--- arch/parisc/Kconfig	6 Nov 2002 14:23:40 -0000	1.7
+++ arch/parisc/Kconfig	6 Nov 2002 17:05:12 -0000
@@ -228,14 +228,11 @@ source "drivers/parport/Kconfig"
 
 source "drivers/block/Kconfig"
 
-menu "ATA/IDE/MFM/RLL support"
-	depends on SUPERIO
 
+menu "ATA/IDE/MFM/RLL support"
 config IDE
 	tristate "ATA/IDE/MFM/RLL support"
-
 source "drivers/ide/Kconfig"
-
 endmenu
 
 menu "SCSI support"
Index: arch/parisc/kernel/parisc_ksyms.c
===================================================================
RCS file: /var/cvs/linux-2.5/arch/parisc/kernel/parisc_ksyms.c,v
retrieving revision 1.9
diff -u -p -r1.9 parisc_ksyms.c
--- arch/parisc/kernel/parisc_ksyms.c	1 Nov 2002 01:04:30 -0000	1.9
+++ arch/parisc/kernel/parisc_ksyms.c	6 Nov 2002 17:05:12 -0000
@@ -215,3 +215,5 @@ extern void $$dyncall(void);
 EXPORT_SYMBOL_NOVERS($$dyncall);
 #endif
 
+#include <asm/pgtable.h>
+EXPORT_SYMBOL_NOVERS(vmalloc_start);
Index: drivers/block/Makefile
===================================================================
RCS file: /var/cvs/linux-2.5/drivers/block/Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile
--- drivers/block/Makefile	17 Oct 2002 20:42:42 -0000	1.5
+++ drivers/block/Makefile	6 Nov 2002 17:05:12 -0000
@@ -8,7 +8,7 @@
 # In the future, some of these should be built conditionally.
 #
 
-export-objs	:= elevator.o ll_rw_blk.o loop.o genhd.o acsi.o \
+export-objs	:= elevator.o ll_rw_blk.o ioctl.o loop.o genhd.o acsi.o \
 		   scsi_ioctl.o deadline-iosched.o
 
 obj-y	:= elevator.o ll_rw_blk.o ioctl.o genhd.o scsi_ioctl.o deadline-iosched.o
Index: drivers/block/ioctl.c
===================================================================
RCS file: /var/cvs/linux-2.5/drivers/block/ioctl.c,v
retrieving revision 1.3
diff -u -p -r1.3 ioctl.c
--- drivers/block/ioctl.c	31 Oct 2002 23:29:35 -0000	1.3
+++ drivers/block/ioctl.c	6 Nov 2002 17:05:12 -0000
@@ -5,6 +5,8 @@
 #include <linux/buffer_head.h>
 #include <asm/uaccess.h>
 
+#include <linux/module.h>
+
 static int blkpg_ioctl(struct block_device *bdev, struct blkpg_ioctl_arg *arg)
 {
 	struct block_device *bdevp;
@@ -214,3 +216,5 @@ int blkdev_ioctl(struct inode *inode, st
 	}
 	return -ENOTTY;
 }
+
+EXPORT_SYMBOL(blkdev_ioctl);
Index: drivers/parisc/Kconfig
===================================================================
RCS file: /var/cvs/linux-2.5/drivers/parisc/Kconfig,v
retrieving revision 1.3
diff -u -p -r1.3 Kconfig
--- drivers/parisc/Kconfig	6 Nov 2002 14:23:40 -0000	1.3
+++ drivers/parisc/Kconfig	6 Nov 2002 17:05:12 -0000
@@ -89,6 +89,8 @@ config IOMMU_SBA
 	depends on PCI_LBA
 	default y
 
+source "drivers/pci/Kconfig"
+
 #config PCI_EPIC
 #	bool "EPIC/SAGA PCI support"
 #	depends on PCI
@@ -97,10 +99,9 @@ config SUPERIO
 	bool
 	depends on PCI
 	help
-	  Say Y here to support the SuperIO chip found in Bxxxx, Cxxxx and
-	  J5xxx+ machines.
-
-source "drivers/pci/Kconfig"
+	  Say Y here to support the SuperIO chip found in Bxxxx, C3xxx and
+	  J5xxx+ machines. This enables IDE, Floppy, Parallel Port, and
+	  Serial port on those machines.
 
 config CHASSIS_LCD_LED
 	bool "Chassis LCD and LED support"