rpms/kernel/devel kernel-2.6.spec, 1.1862, 1.1863 linux-2.6-compile-fixes.patch, 1.45, 1.46

[fedora-cvs-commits at redhat.com]

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27955

Modified Files:
	kernel-2.6.spec linux-2.6-compile-fixes.patch 
Log Message:
fix ia64 unresolved syms



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1862
retrieving revision 1.1863
diff -u -r1.1862 -r1.1863
--- kernel-2.6.spec	19 Jan 2006 22:08:18 -0000	1.1862
+++ kernel-2.6.spec	20 Jan 2006 00:07:05 -0000	1.1863
@@ -1345,6 +1345,7 @@
 %changelog
 * Thu Jan 19 2006 Dave Jones <davej at redhat.com>
 - 2.6.16-rc1-git2
+- Fix IA64 unresolved symbols.
 
 * Wed Jan 18 2006 Dave Jones <davej at redhat.com>
 - 2.6.16-rc1-git1

linux-2.6-compile-fixes.patch:
 linux-2.6.15/arch/s390/kernel/setup.c     |    2 ++
 linux-2.6.15/drivers/net/spider_net.c     |    1 +
 linux-2.6.15/include/asm-generic/signal.h |    1 +
 linux-2.6/arch/ia64/Kconfig               |    3 +++
 linux-2.6/drivers/Makefile                |    2 +-
 5 files changed, 8 insertions(+), 1 deletion(-)

Index: linux-2.6-compile-fixes.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-compile-fixes.patch,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- linux-2.6-compile-fixes.patch	11 Jan 2006 00:35:05 -0000	1.45
+++ linux-2.6-compile-fixes.patch	20 Jan 2006 00:07:07 -0000	1.46
@@ -29,3 +29,43 @@
  static void __init
  add_memory_hole(unsigned long start, unsigned long end)
  {
+
+
+Include drivers/sn when CONFIG_IA64_SGI_SN2 or CONFIG_IA64_GENERIC
+is enabled.
+
+Signed-off-by: Jes Sorensen <jes at 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/
+