[2.6 patch] drivers/sn/ must be entered for CONFIG_SGI_IOC3

[2.6 patch] drivers/sn/ must be entered for CONFIG_SGI_IOC3

[Adrian Bunk]

On Tue, Jan 17, 2006 at 06:55:21PM -0500, Dave Jones wrote:

> kernel/drivers/serial/ioc3_serial.ko needs unknown symbol ioc3_unregister_submodule
> 
> CONFIG_SERIAL_SGI_IOC3=m
> CONFIG_SGI_IOC3=m

The untested patch below should fix it.

> 		Dave

cu
Adrian


<--  snip  -->


Signed-off-by: Adrian Bunk <bunk@stusta.de>

--- linux-2.6.16-rc1-mm1-full/drivers/Makefile.old	2006-01-19 04:14:24.000000000 +0100
+++ linux-2.6.16-rc1-mm1-full/drivers/Makefile	2006-01-19 04:14:57.000000000 +0100
@@ -70,6 +70,7 @@
 obj-$(CONFIG_CPU_FREQ)		+= cpufreq/
 obj-$(CONFIG_MMC)		+= mmc/
 obj-$(CONFIG_INFINIBAND)	+= infiniband/
+obj-$(CONFIG_SGI_IOC3)		+= sn/
 obj-$(CONFIG_SGI_IOC4)		+= sn/
 obj-y				+= firmware/
 obj-$(CONFIG_CRYPTO)		+= crypto/

Re: [2.6 patch] drivers/sn/ must be entered for CONFIG_SGI_IOC3

[Jes Sorensen]

>>>>> "Adrian" = Adrian Bunk <bunk@stusta.de> writes:

Adrian> On Tue, Jan 17, 2006 at 06:55:21PM -0500, Dave Jones wrote:
>> kernel/drivers/serial/ioc3_serial.ko needs unknown symbol
>> ioc3_unregister_submodule
>> 
>> CONFIG_SERIAL_SGI_IOC3=m CONFIG_SGI_IOC3=m

Adrian> The untested patch below should fix it.

Actually I think this is more appropriate so we don't end up with 17
cases that add drivers/sn to the build lib.

Dave, does this solve the problem?

Cheers,
Jes

Include drivers/sn when CONFIG_IA64_SGI_SN2 or CONFIG_IA64_GENERIC
is enabled.

Signed-off-by: Jes Sorensen <jes@sgi.com>
----

 arch/ia64/Kconfig |    3 +++
 drivers/Makefile  |    2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

Index: linux-2.6/arch/ia64/Kconfig
=================================--- linux-2.6.orig/arch/ia64/Kconfig
+++ linux-2.6/arch/ia64/Kconfig
@@ -374,6 +374,9 @@
 	  To use this option, you have to ensure that the "/proc file system
 	  support" (CONFIG_PROC_FS) is enabled, too.
 
+config SGI_SN
+	def_bool y if (IA64_SGI_SN2 || IA64_GENERIC)
+
 source "drivers/firmware/Kconfig"
 
 source "fs/Kconfig.binfmt"
Index: linux-2.6/drivers/Makefile
=================================--- linux-2.6.orig/drivers/Makefile
+++ linux-2.6/drivers/Makefile
@@ -69,7 +69,7 @@
 obj-$(CONFIG_CPU_FREQ)		+= cpufreq/
 obj-$(CONFIG_MMC)		+= mmc/
 obj-$(CONFIG_INFINIBAND)	+= infiniband/
-obj-$(CONFIG_SGI_IOC4)		+= sn/
+obj-$(CONFIG_SGI_SN)		+= sn/
 obj-y				+= firmware/
 obj-$(CONFIG_CRYPTO)		+= crypto/
 obj-$(CONFIG_SUPERH)		+= sh/

Re: [2.6 patch] drivers/sn/ must be entered for CONFIG_SGI_IOC3

[Adrian Bunk]

On Thu, Jan 19, 2006 at 04:54:00AM -0500, Jes Sorensen wrote:
> >>>>> "Adrian" = Adrian Bunk <bunk@stusta.de> writes:
> 
> Adrian> On Tue, Jan 17, 2006 at 06:55:21PM -0500, Dave Jones wrote:
> >> kernel/drivers/serial/ioc3_serial.ko needs unknown symbol
> >> ioc3_unregister_submodule
> >> 
> >> CONFIG_SERIAL_SGI_IOC3=m CONFIG_SGI_IOC3=m
> 
> Adrian> The untested patch below should fix it.
> 
> Actually I think this is more appropriate so we don't end up with 17
> cases that add drivers/sn to the build lib.
>...

I haven't tested your patch, but I agree that it's a better approach 
than my patch.
 
> Cheers,
> Jes
>...

cu
Adrian

-- 

       "Is there not promise of rain?" Ling Tan asked suddenly out
        of the darkness. There had been need of rain for many days.
       "Only a promise," Lao Er said.
                                       Pearl S. Buck - Dragon Seed

Re: [2.6 patch] drivers/sn/ must be entered for CONFIG_SGI_IOC3

[Dave Jones]

On Thu, Jan 19, 2006 at 04:54:00AM -0500, Jes Sorensen wrote:
 > >>>>> "Adrian" = Adrian Bunk <bunk@stusta.de> writes:
 > 
 > Adrian> On Tue, Jan 17, 2006 at 06:55:21PM -0500, Dave Jones wrote:
 > >> kernel/drivers/serial/ioc3_serial.ko needs unknown symbol
 > >> ioc3_unregister_submodule
 > >> 
 > >> CONFIG_SERIAL_SGI_IOC3=m CONFIG_SGI_IOC3=m
 > 
 > Adrian> The untested patch below should fix it.
 > 
 > Actually I think this is more appropriate so we don't end up with 17
 > cases that add drivers/sn to the build lib.
 > 
 > Dave, does this solve the problem?

Yep, looks like it.

		Dave