[kernel] r6820 - in dists/trunk/linux-2.6/debian: .

[Dann Frazier]

Author: dannf
Date: Sun Jun 18 18:10:14 2006
New Revision: 6820

Modified:
   dists/trunk/linux-2.6/debian/arch/ia64/config
   dists/trunk/linux-2.6/debian/changelog

Log:
update ia64 configs

Modified: dists/trunk/linux-2.6/debian/arch/ia64/config
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/ia64/config	(original)
+++ dists/trunk/linux-2.6/debian/arch/ia64/config	Sun Jun 18 18:10:14 2006
@@ -1274,3 +1274,29 @@
 # CONFIG_CPU_FREQ is not set
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 # CONFIG_IPW2100 is not set
+CONFIG_VIDEO_V4L1_COMPAT=y
+CONFIG_RIO=m
+CONFIG_ARCH_FLATMEM_ENABLE=y
+CONFIG_DMA_IS_DMA32=y
+CONFIG_SERIAL_8250_PCI=y
+CONFIG_NODES_SHIFT=8
+CONFIG_VIDEO_V4L2=m
+CONFIG_HAVE_ARCH_EARLY_PFN_TO_NID=y
+CONFIG_ARCH_DISCONTIGMEM_DEFAULT=y
+CONFIG_AGP_SIS=m
+CONFIG_SWIOTLB=y
+CONFIG_RIO_OLDPCI=y
+CONFIG_NEED_MULTIPLE_NODES=y
+CONFIG_SERIAL_8250_PNP=y
+CONFIG_IA64_UNCACHED_ALLOCATOR=y
+CONFIG_GENERIC_FIND_NEXT_BIT=y
+CONFIG_GENERIC_ALLOCATOR=y
+CONFIG_ARCH_SPARSEMEM_ENABLE=y
+CONFIG_DISCONTIGMEM=y
+CONFIG_ARCH_SELECT_MEMORY_MODEL=y
+CONFIG_SPLIT_PTLOCK_CPUS=4
+CONFIG_SGI_SN=y
+CONFIG_MIGRATION=y
+CONFIG_ACPI_EC=y
+CONFIG_AGP_VIA=m
+# CONFIG_BLK_DEV_IDEPNP is not set

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	(original)
+++ dists/trunk/linux-2.6/debian/changelog	Sun Jun 18 18:10:14 2006
@@ -18,7 +18,10 @@
   * [s390] Use gcc 4.1.
   * [i386] Enable REGPARM.
 
- -- Bastian Blank <waldi at debian.org>  Sun, 18 Jun 2006 10:50:18 +0200
+  [ dann frazier ]
+  * [ia64] Update configs
+
+ -- dann frazier <dannf at debian.org>  Sun, 18 Jun 2006 12:09:06 -0600
 
 linux-2.6 (2.6.16+2.6.17-rc3-0experimental.1) experimental; urgency=low