r3857 - in people/waldi/kernel/source/linux-2.6/debian: . arch/hppa
arch/m68k arch/powerpc arch/sparc patches-arch templates
Bastian Blank
waldi at costa.debian.org
Sun Aug 14 14:38:53 UTC 2005
Author: waldi
Date: 2005-08-14 14:38:50 +0000 (Sun, 14 Aug 2005)
New Revision: 3857
Added:
people/waldi/kernel/source/linux-2.6/debian/arch/powerpc/config.powerpc64
Removed:
people/waldi/kernel/source/linux-2.6/debian/arch/powerpc/config.pseries
Modified:
people/waldi/kernel/source/linux-2.6/debian/
people/waldi/kernel/source/linux-2.6/debian/arch/hppa/config
people/waldi/kernel/source/linux-2.6/debian/arch/hppa/config.32
people/waldi/kernel/source/linux-2.6/debian/arch/hppa/config.32-smp
people/waldi/kernel/source/linux-2.6/debian/arch/hppa/config.64
people/waldi/kernel/source/linux-2.6/debian/arch/hppa/config.64-smp
people/waldi/kernel/source/linux-2.6/debian/arch/m68k/Makefile.inc
people/waldi/kernel/source/linux-2.6/debian/arch/powerpc/Makefile.inc
people/waldi/kernel/source/linux-2.6/debian/arch/sparc/config
people/waldi/kernel/source/linux-2.6/debian/changelog
people/waldi/kernel/source/linux-2.6/debian/patches-arch/hppa.diff
people/waldi/kernel/source/linux-2.6/debian/templates/control.source.in
people/waldi/kernel/source/linux-2.6/debian/templates/post-install.in
Log:
Merge /trunk/kernel/source/linux-2.6.
Property changes on: people/waldi/kernel/source/linux-2.6/debian
___________________________________________________________________
Name: svk:merge
- 510b9475-24dd-0310-9b6c-e0eefe99d49f:/trunk/kernel/source/linux-2.6/debian:3790
+ 510b9475-24dd-0310-9b6c-e0eefe99d49f:/trunk/kernel/source/linux-2.6/debian:3856
Modified: people/waldi/kernel/source/linux-2.6/debian/arch/hppa/config
===================================================================
--- people/waldi/kernel/source/linux-2.6/debian/arch/hppa/config 2005-08-14 13:26:38 UTC (rev 3856)
+++ people/waldi/kernel/source/linux-2.6/debian/arch/hppa/config 2005-08-14 14:38:50 UTC (rev 3857)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.12
-# Tue Aug 9 03:42:02 2005
+# Wed Aug 10 01:50:37 2005
#
CONFIG_PARISC=y
CONFIG_MMU=y
@@ -1001,94 +1001,9 @@
#
# I2C support
#
-CONFIG_I2C=m
-CONFIG_I2C_CHARDEV=m
+# CONFIG_I2C is not set
#
-# I2C Algorithms
-#
-CONFIG_I2C_ALGOBIT=m
-CONFIG_I2C_ALGOPCF=m
-CONFIG_I2C_ALGOPCA=m
-
-#
-# I2C Hardware Bus support
-#
-CONFIG_I2C_ALI1535=m
-CONFIG_I2C_ALI1563=m
-CONFIG_I2C_ALI15X3=m
-CONFIG_I2C_AMD756=m
-CONFIG_I2C_AMD756_S4882=m
-CONFIG_I2C_AMD8111=m
-CONFIG_I2C_ELEKTOR=m
-CONFIG_I2C_I801=m
-CONFIG_I2C_I810=m
-CONFIG_I2C_PIIX4=m
-CONFIG_I2C_ISA=m
-CONFIG_I2C_NFORCE2=m
-CONFIG_I2C_PARPORT=m
-CONFIG_I2C_PARPORT_LIGHT=m
-CONFIG_I2C_PROSAVAGE=m
-CONFIG_I2C_SAVAGE4=m
-CONFIG_SCx200_ACB=m
-CONFIG_I2C_SIS5595=m
-CONFIG_I2C_SIS630=m
-CONFIG_I2C_SIS96X=m
-CONFIG_I2C_STUB=m
-CONFIG_I2C_VIA=m
-CONFIG_I2C_VIAPRO=m
-CONFIG_I2C_VOODOO3=m
-CONFIG_I2C_PCA_ISA=m
-
-#
-# Hardware Sensors Chip support
-#
-CONFIG_I2C_SENSOR=m
-CONFIG_SENSORS_ADM1021=m
-CONFIG_SENSORS_ADM1025=m
-CONFIG_SENSORS_ADM1026=m
-CONFIG_SENSORS_ADM1031=m
-CONFIG_SENSORS_ASB100=m
-CONFIG_SENSORS_DS1621=m
-CONFIG_SENSORS_FSCHER=m
-CONFIG_SENSORS_FSCPOS=m
-CONFIG_SENSORS_GL518SM=m
-CONFIG_SENSORS_GL520SM=m
-CONFIG_SENSORS_IT87=m
-CONFIG_SENSORS_LM63=m
-CONFIG_SENSORS_LM75=m
-CONFIG_SENSORS_LM77=m
-CONFIG_SENSORS_LM78=m
-CONFIG_SENSORS_LM80=m
-CONFIG_SENSORS_LM83=m
-CONFIG_SENSORS_LM85=m
-CONFIG_SENSORS_LM87=m
-CONFIG_SENSORS_LM90=m
-CONFIG_SENSORS_LM92=m
-CONFIG_SENSORS_MAX1619=m
-CONFIG_SENSORS_PC87360=m
-CONFIG_SENSORS_SMSC47B397=m
-CONFIG_SENSORS_SIS5595=m
-CONFIG_SENSORS_SMSC47M1=m
-CONFIG_SENSORS_VIA686A=m
-CONFIG_SENSORS_W83781D=m
-CONFIG_SENSORS_W83L785TS=m
-CONFIG_SENSORS_W83627HF=m
-
-#
-# Other I2C Chip support
-#
-CONFIG_SENSORS_DS1337=m
-CONFIG_SENSORS_EEPROM=m
-CONFIG_SENSORS_PCF8574=m
-CONFIG_SENSORS_PCF8591=m
-CONFIG_SENSORS_RTC8564=m
-# CONFIG_I2C_DEBUG_CORE is not set
-# CONFIG_I2C_DEBUG_ALGO is not set
-# CONFIG_I2C_DEBUG_BUS is not set
-# CONFIG_I2C_DEBUG_CHIP is not set
-
-#
# Dallas's 1-wire bus
#
# CONFIG_W1 is not set
Modified: people/waldi/kernel/source/linux-2.6/debian/arch/hppa/config.32
===================================================================
--- people/waldi/kernel/source/linux-2.6/debian/arch/hppa/config.32 2005-08-14 13:26:38 UTC (rev 3856)
+++ people/waldi/kernel/source/linux-2.6/debian/arch/hppa/config.32 2005-08-14 14:38:50 UTC (rev 3857)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.12
-# Tue Aug 9 03:42:02 2005
+# Wed Aug 10 01:50:37 2005
#
CONFIG_PARISC=y
CONFIG_MMU=y
@@ -1001,94 +1001,9 @@
#
# I2C support
#
-CONFIG_I2C=m
-CONFIG_I2C_CHARDEV=m
+# CONFIG_I2C is not set
#
-# I2C Algorithms
-#
-CONFIG_I2C_ALGOBIT=m
-CONFIG_I2C_ALGOPCF=m
-CONFIG_I2C_ALGOPCA=m
-
-#
-# I2C Hardware Bus support
-#
-CONFIG_I2C_ALI1535=m
-CONFIG_I2C_ALI1563=m
-CONFIG_I2C_ALI15X3=m
-CONFIG_I2C_AMD756=m
-CONFIG_I2C_AMD756_S4882=m
-CONFIG_I2C_AMD8111=m
-CONFIG_I2C_ELEKTOR=m
-CONFIG_I2C_I801=m
-CONFIG_I2C_I810=m
-CONFIG_I2C_PIIX4=m
-CONFIG_I2C_ISA=m
-CONFIG_I2C_NFORCE2=m
-CONFIG_I2C_PARPORT=m
-CONFIG_I2C_PARPORT_LIGHT=m
-CONFIG_I2C_PROSAVAGE=m
-CONFIG_I2C_SAVAGE4=m
-CONFIG_SCx200_ACB=m
-CONFIG_I2C_SIS5595=m
-CONFIG_I2C_SIS630=m
-CONFIG_I2C_SIS96X=m
-CONFIG_I2C_STUB=m
-CONFIG_I2C_VIA=m
-CONFIG_I2C_VIAPRO=m
-CONFIG_I2C_VOODOO3=m
-CONFIG_I2C_PCA_ISA=m
-
-#
-# Hardware Sensors Chip support
-#
-CONFIG_I2C_SENSOR=m
-CONFIG_SENSORS_ADM1021=m
-CONFIG_SENSORS_ADM1025=m
-CONFIG_SENSORS_ADM1026=m
-CONFIG_SENSORS_ADM1031=m
-CONFIG_SENSORS_ASB100=m
-CONFIG_SENSORS_DS1621=m
-CONFIG_SENSORS_FSCHER=m
-CONFIG_SENSORS_FSCPOS=m
-CONFIG_SENSORS_GL518SM=m
-CONFIG_SENSORS_GL520SM=m
-CONFIG_SENSORS_IT87=m
-CONFIG_SENSORS_LM63=m
-CONFIG_SENSORS_LM75=m
-CONFIG_SENSORS_LM77=m
-CONFIG_SENSORS_LM78=m
-CONFIG_SENSORS_LM80=m
-CONFIG_SENSORS_LM83=m
-CONFIG_SENSORS_LM85=m
-CONFIG_SENSORS_LM87=m
-CONFIG_SENSORS_LM90=m
-CONFIG_SENSORS_LM92=m
-CONFIG_SENSORS_MAX1619=m
-CONFIG_SENSORS_PC87360=m
-CONFIG_SENSORS_SMSC47B397=m
-CONFIG_SENSORS_SIS5595=m
-CONFIG_SENSORS_SMSC47M1=m
-CONFIG_SENSORS_VIA686A=m
-CONFIG_SENSORS_W83781D=m
-CONFIG_SENSORS_W83L785TS=m
-CONFIG_SENSORS_W83627HF=m
-
-#
-# Other I2C Chip support
-#
-CONFIG_SENSORS_DS1337=m
-CONFIG_SENSORS_EEPROM=m
-CONFIG_SENSORS_PCF8574=m
-CONFIG_SENSORS_PCF8591=m
-CONFIG_SENSORS_RTC8564=m
-# CONFIG_I2C_DEBUG_CORE is not set
-# CONFIG_I2C_DEBUG_ALGO is not set
-# CONFIG_I2C_DEBUG_BUS is not set
-# CONFIG_I2C_DEBUG_CHIP is not set
-
-#
# Dallas's 1-wire bus
#
# CONFIG_W1 is not set
Modified: people/waldi/kernel/source/linux-2.6/debian/arch/hppa/config.32-smp
===================================================================
--- people/waldi/kernel/source/linux-2.6/debian/arch/hppa/config.32-smp 2005-08-14 13:26:38 UTC (rev 3856)
+++ people/waldi/kernel/source/linux-2.6/debian/arch/hppa/config.32-smp 2005-08-14 14:38:50 UTC (rev 3857)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.12
-# Tue Aug 9 03:42:22 2005
+# Wed Aug 10 01:51:38 2005
#
CONFIG_PARISC=y
CONFIG_MMU=y
@@ -1003,93 +1003,9 @@
#
# I2C support
#
-CONFIG_I2C=m
-CONFIG_I2C_CHARDEV=m
+# CONFIG_I2C is not set
#
-# I2C Algorithms
-#
-CONFIG_I2C_ALGOBIT=m
-CONFIG_I2C_ALGOPCF=m
-CONFIG_I2C_ALGOPCA=m
-
-#
-# I2C Hardware Bus support
-#
-CONFIG_I2C_ALI1535=m
-CONFIG_I2C_ALI1563=m
-CONFIG_I2C_ALI15X3=m
-CONFIG_I2C_AMD756=m
-CONFIG_I2C_AMD756_S4882=m
-CONFIG_I2C_AMD8111=m
-CONFIG_I2C_I801=m
-CONFIG_I2C_I810=m
-CONFIG_I2C_PIIX4=m
-CONFIG_I2C_ISA=m
-CONFIG_I2C_NFORCE2=m
-CONFIG_I2C_PARPORT=m
-CONFIG_I2C_PARPORT_LIGHT=m
-CONFIG_I2C_PROSAVAGE=m
-CONFIG_I2C_SAVAGE4=m
-CONFIG_SCx200_ACB=m
-CONFIG_I2C_SIS5595=m
-CONFIG_I2C_SIS630=m
-CONFIG_I2C_SIS96X=m
-CONFIG_I2C_STUB=m
-CONFIG_I2C_VIA=m
-CONFIG_I2C_VIAPRO=m
-CONFIG_I2C_VOODOO3=m
-CONFIG_I2C_PCA_ISA=m
-
-#
-# Hardware Sensors Chip support
-#
-CONFIG_I2C_SENSOR=m
-CONFIG_SENSORS_ADM1021=m
-CONFIG_SENSORS_ADM1025=m
-CONFIG_SENSORS_ADM1026=m
-CONFIG_SENSORS_ADM1031=m
-CONFIG_SENSORS_ASB100=m
-CONFIG_SENSORS_DS1621=m
-CONFIG_SENSORS_FSCHER=m
-CONFIG_SENSORS_FSCPOS=m
-CONFIG_SENSORS_GL518SM=m
-CONFIG_SENSORS_GL520SM=m
-CONFIG_SENSORS_IT87=m
-CONFIG_SENSORS_LM63=m
-CONFIG_SENSORS_LM75=m
-CONFIG_SENSORS_LM77=m
-CONFIG_SENSORS_LM78=m
-CONFIG_SENSORS_LM80=m
-CONFIG_SENSORS_LM83=m
-CONFIG_SENSORS_LM85=m
-CONFIG_SENSORS_LM87=m
-CONFIG_SENSORS_LM90=m
-CONFIG_SENSORS_LM92=m
-CONFIG_SENSORS_MAX1619=m
-CONFIG_SENSORS_PC87360=m
-CONFIG_SENSORS_SMSC47B397=m
-CONFIG_SENSORS_SIS5595=m
-CONFIG_SENSORS_SMSC47M1=m
-CONFIG_SENSORS_VIA686A=m
-CONFIG_SENSORS_W83781D=m
-CONFIG_SENSORS_W83L785TS=m
-CONFIG_SENSORS_W83627HF=m
-
-#
-# Other I2C Chip support
-#
-CONFIG_SENSORS_DS1337=m
-CONFIG_SENSORS_EEPROM=m
-CONFIG_SENSORS_PCF8574=m
-CONFIG_SENSORS_PCF8591=m
-CONFIG_SENSORS_RTC8564=m
-# CONFIG_I2C_DEBUG_CORE is not set
-# CONFIG_I2C_DEBUG_ALGO is not set
-# CONFIG_I2C_DEBUG_BUS is not set
-# CONFIG_I2C_DEBUG_CHIP is not set
-
-#
# Dallas's 1-wire bus
#
# CONFIG_W1 is not set
Modified: people/waldi/kernel/source/linux-2.6/debian/arch/hppa/config.64
===================================================================
--- people/waldi/kernel/source/linux-2.6/debian/arch/hppa/config.64 2005-08-14 13:26:38 UTC (rev 3856)
+++ people/waldi/kernel/source/linux-2.6/debian/arch/hppa/config.64 2005-08-14 14:38:50 UTC (rev 3857)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.12
-# Tue Aug 9 03:42:53 2005
+# Wed Aug 10 01:52:22 2005
#
CONFIG_PARISC=y
CONFIG_MMU=y
@@ -997,94 +997,9 @@
#
# I2C support
#
-CONFIG_I2C=m
-CONFIG_I2C_CHARDEV=m
+# CONFIG_I2C is not set
#
-# I2C Algorithms
-#
-CONFIG_I2C_ALGOBIT=m
-CONFIG_I2C_ALGOPCF=m
-CONFIG_I2C_ALGOPCA=m
-
-#
-# I2C Hardware Bus support
-#
-CONFIG_I2C_ALI1535=m
-CONFIG_I2C_ALI1563=m
-CONFIG_I2C_ALI15X3=m
-CONFIG_I2C_AMD756=m
-CONFIG_I2C_AMD756_S4882=m
-CONFIG_I2C_AMD8111=m
-# CONFIG_I2C_ELEKTOR is not set
-CONFIG_I2C_I801=m
-CONFIG_I2C_I810=m
-CONFIG_I2C_PIIX4=m
-CONFIG_I2C_ISA=m
-CONFIG_I2C_NFORCE2=m
-CONFIG_I2C_PARPORT=m
-CONFIG_I2C_PARPORT_LIGHT=m
-CONFIG_I2C_PROSAVAGE=m
-CONFIG_I2C_SAVAGE4=m
-CONFIG_SCx200_ACB=m
-CONFIG_I2C_SIS5595=m
-CONFIG_I2C_SIS630=m
-CONFIG_I2C_SIS96X=m
-CONFIG_I2C_STUB=m
-CONFIG_I2C_VIA=m
-CONFIG_I2C_VIAPRO=m
-CONFIG_I2C_VOODOO3=m
-CONFIG_I2C_PCA_ISA=m
-
-#
-# Hardware Sensors Chip support
-#
-CONFIG_I2C_SENSOR=m
-CONFIG_SENSORS_ADM1021=m
-CONFIG_SENSORS_ADM1025=m
-CONFIG_SENSORS_ADM1026=m
-CONFIG_SENSORS_ADM1031=m
-CONFIG_SENSORS_ASB100=m
-CONFIG_SENSORS_DS1621=m
-CONFIG_SENSORS_FSCHER=m
-CONFIG_SENSORS_FSCPOS=m
-CONFIG_SENSORS_GL518SM=m
-CONFIG_SENSORS_GL520SM=m
-CONFIG_SENSORS_IT87=m
-CONFIG_SENSORS_LM63=m
-CONFIG_SENSORS_LM75=m
-CONFIG_SENSORS_LM77=m
-CONFIG_SENSORS_LM78=m
-CONFIG_SENSORS_LM80=m
-CONFIG_SENSORS_LM83=m
-CONFIG_SENSORS_LM85=m
-CONFIG_SENSORS_LM87=m
-CONFIG_SENSORS_LM90=m
-CONFIG_SENSORS_LM92=m
-CONFIG_SENSORS_MAX1619=m
-CONFIG_SENSORS_PC87360=m
-CONFIG_SENSORS_SMSC47B397=m
-CONFIG_SENSORS_SIS5595=m
-CONFIG_SENSORS_SMSC47M1=m
-CONFIG_SENSORS_VIA686A=m
-CONFIG_SENSORS_W83781D=m
-CONFIG_SENSORS_W83L785TS=m
-CONFIG_SENSORS_W83627HF=m
-
-#
-# Other I2C Chip support
-#
-CONFIG_SENSORS_DS1337=m
-CONFIG_SENSORS_EEPROM=m
-CONFIG_SENSORS_PCF8574=m
-CONFIG_SENSORS_PCF8591=m
-CONFIG_SENSORS_RTC8564=m
-# CONFIG_I2C_DEBUG_CORE is not set
-# CONFIG_I2C_DEBUG_ALGO is not set
-# CONFIG_I2C_DEBUG_BUS is not set
-# CONFIG_I2C_DEBUG_CHIP is not set
-
-#
# Dallas's 1-wire bus
#
# CONFIG_W1 is not set
Modified: people/waldi/kernel/source/linux-2.6/debian/arch/hppa/config.64-smp
===================================================================
--- people/waldi/kernel/source/linux-2.6/debian/arch/hppa/config.64-smp 2005-08-14 13:26:38 UTC (rev 3856)
+++ people/waldi/kernel/source/linux-2.6/debian/arch/hppa/config.64-smp 2005-08-14 14:38:50 UTC (rev 3857)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.12
-# Tue Aug 9 03:42:39 2005
+# Wed Aug 10 01:52:05 2005
#
CONFIG_PARISC=y
CONFIG_MMU=y
@@ -999,93 +999,9 @@
#
# I2C support
#
-CONFIG_I2C=m
-CONFIG_I2C_CHARDEV=m
+# CONFIG_I2C is not set
#
-# I2C Algorithms
-#
-CONFIG_I2C_ALGOBIT=m
-CONFIG_I2C_ALGOPCF=m
-CONFIG_I2C_ALGOPCA=m
-
-#
-# I2C Hardware Bus support
-#
-CONFIG_I2C_ALI1535=m
-CONFIG_I2C_ALI1563=m
-CONFIG_I2C_ALI15X3=m
-CONFIG_I2C_AMD756=m
-CONFIG_I2C_AMD756_S4882=m
-CONFIG_I2C_AMD8111=m
-CONFIG_I2C_I801=m
-CONFIG_I2C_I810=m
-CONFIG_I2C_PIIX4=m
-CONFIG_I2C_ISA=m
-CONFIG_I2C_NFORCE2=m
-CONFIG_I2C_PARPORT=m
-CONFIG_I2C_PARPORT_LIGHT=m
-CONFIG_I2C_PROSAVAGE=m
-CONFIG_I2C_SAVAGE4=m
-CONFIG_SCx200_ACB=m
-CONFIG_I2C_SIS5595=m
-CONFIG_I2C_SIS630=m
-CONFIG_I2C_SIS96X=m
-CONFIG_I2C_STUB=m
-CONFIG_I2C_VIA=m
-CONFIG_I2C_VIAPRO=m
-CONFIG_I2C_VOODOO3=m
-CONFIG_I2C_PCA_ISA=m
-
-#
-# Hardware Sensors Chip support
-#
-CONFIG_I2C_SENSOR=m
-CONFIG_SENSORS_ADM1021=m
-CONFIG_SENSORS_ADM1025=m
-CONFIG_SENSORS_ADM1026=m
-CONFIG_SENSORS_ADM1031=m
-CONFIG_SENSORS_ASB100=m
-CONFIG_SENSORS_DS1621=m
-CONFIG_SENSORS_FSCHER=m
-CONFIG_SENSORS_FSCPOS=m
-CONFIG_SENSORS_GL518SM=m
-CONFIG_SENSORS_GL520SM=m
-CONFIG_SENSORS_IT87=m
-CONFIG_SENSORS_LM63=m
-CONFIG_SENSORS_LM75=m
-CONFIG_SENSORS_LM77=m
-CONFIG_SENSORS_LM78=m
-CONFIG_SENSORS_LM80=m
-CONFIG_SENSORS_LM83=m
-CONFIG_SENSORS_LM85=m
-CONFIG_SENSORS_LM87=m
-CONFIG_SENSORS_LM90=m
-CONFIG_SENSORS_LM92=m
-CONFIG_SENSORS_MAX1619=m
-CONFIG_SENSORS_PC87360=m
-CONFIG_SENSORS_SMSC47B397=m
-CONFIG_SENSORS_SIS5595=m
-CONFIG_SENSORS_SMSC47M1=m
-CONFIG_SENSORS_VIA686A=m
-CONFIG_SENSORS_W83781D=m
-CONFIG_SENSORS_W83L785TS=m
-CONFIG_SENSORS_W83627HF=m
-
-#
-# Other I2C Chip support
-#
-CONFIG_SENSORS_DS1337=m
-CONFIG_SENSORS_EEPROM=m
-CONFIG_SENSORS_PCF8574=m
-CONFIG_SENSORS_PCF8591=m
-CONFIG_SENSORS_RTC8564=m
-# CONFIG_I2C_DEBUG_CORE is not set
-# CONFIG_I2C_DEBUG_ALGO is not set
-# CONFIG_I2C_DEBUG_BUS is not set
-# CONFIG_I2C_DEBUG_CHIP is not set
-
-#
# Dallas's 1-wire bus
#
# CONFIG_W1 is not set
Modified: people/waldi/kernel/source/linux-2.6/debian/arch/m68k/Makefile.inc
===================================================================
--- people/waldi/kernel/source/linux-2.6/debian/arch/m68k/Makefile.inc 2005-08-14 13:26:38 UTC (rev 3856)
+++ people/waldi/kernel/source/linux-2.6/debian/arch/m68k/Makefile.inc 2005-08-14 14:38:50 UTC (rev 3857)
@@ -1,4 +1,4 @@
#
# Variables
#
-build_makeflags := 'CC=m68k-linux-gcc-3.3'
+build_makeflags := 'CC=m68k-linux-gnu-gcc-3.3'
Modified: people/waldi/kernel/source/linux-2.6/debian/arch/powerpc/Makefile.inc
===================================================================
--- people/waldi/kernel/source/linux-2.6/debian/arch/powerpc/Makefile.inc 2005-08-14 13:26:38 UTC (rev 3856)
+++ people/waldi/kernel/source/linux-2.6/debian/arch/powerpc/Makefile.inc 2005-08-14 14:38:50 UTC (rev 3857)
@@ -1,6 +1,6 @@
#
# Variables
#
-headers_dirs = ppc | ppc64
+headers_dirs = ppc | ppc64 | m68k
headers_subarch = powerpc
build_subarch = powerpc
Added: people/waldi/kernel/source/linux-2.6/debian/arch/powerpc/config.powerpc64
===================================================================
--- people/waldi/kernel/source/linux-2.6/debian/arch/powerpc/config.powerpc64 2005-08-14 13:26:38 UTC (rev 3856)
+++ people/waldi/kernel/source/linux-2.6/debian/arch/powerpc/config.powerpc64 2005-08-14 14:38:50 UTC (rev 3857)
@@ -0,0 +1,63 @@
+CONFIG_64BIT=y
+CONFIG_ADB is not set
+CONFIG_AUDITSYSCALL=y
+CONFIG_COMPAT=y
+CONFIG_CPUSETS=y
+# CONFIG_DEBUGGER is not set
+# CONFIG_DEBUG_STACKOVERFLOW is not set
+# CONFIG_DEBUG_STACK_USAGE is not set
+CONFIG_DISCONTIGMEM=y
+CONFIG_EARLY_PRINTK=y
+CONFIG_EEH=y
+# CONFIG_FB_ATY128 is not set
+# CONFIG_FB_CONTROL is not set
+# CONFIG_FB_IMSTT is not set
+# CONFIG_FB_PLATINUM is not set
+# CONFIG_FB_VALKYRIE is not set
+CONFIG_FORCE_MAX_ZONEORDER=13
+# CONFIG_GEN_RTC is not set
+CONFIG_HANGCHECK_TIMER=m
+# CONFIG_HOTPLUG_CPU is not set
+# CONFIG_HOTPLUG_PCI is not set
+# CONFIG_HUGETLBFS is not set
+CONFIG_HVC_CONSOLE=y
+CONFIG_HVCS=m
+CONFIG_IBMVETH=m
+CONFIG_IBMVIO=y
+CONFIG_IOMMU_VMERGE=y
+# CONFIG_IRQSTACKS is not set
+CONFIG_KEYS_COMPAT=y
+# CONFIG_KPROBES is not set
+CONFIG_LOCK_KERNEL=y
+CONFIG_LPARCFG=m
+CONFIG_MEGARAID_LEGACY=m
+CONFIG_MPIC_BROKEN_U3=y
+CONFIG_NR_CPUS=32
+CONFIG_NUMA=y
+# CONFIG_PMAC_BACKLIGHT is not set
+# CONFIG_PMAC_PBOOK is not set
+CONFIG_PMAC_SMU=y
+# CONFIG_POWER4_ONLY is not set
+CONFIG_PPC64=y
+# CONFIG_PPCDBG is not set
+# CONFIG_PPC_ISERIES is not set
+CONFIG_PPC_MAPLE=y
+CONFIG_PPC_PMAC64=y
+CONFIG_PPC_PSERIES=y
+CONFIG_PPC_RTAS=y
+CONFIG_PPC_SPLPAR=y
+CONFIG_RTAS_FLASH=m
+CONFIG_RTAS_PROC=y
+# CONFIG_RTC is not set
+CONFIG_SCANLOG=m
+CONFIG_SCHED_SMT=y
+CONFIG_SCSI_QLOGIC_1280_1040=y
+CONFIG_SCSI_QLOGIC_1280=m
+CONFIG_SECCOMP=y
+# CONFIG_SERIAL_ICOM is not set
+CONFIG_SMP=y
+# CONFIG_SND_POWERMAC is not set
+CONFIG_STOP_MACHINE=y
+CONFIG_SYSVIPC_COMPAT=y
+# CONFIG_THERM_PM72 is not set
+CONFIG_U3_DART=y
Deleted: people/waldi/kernel/source/linux-2.6/debian/arch/powerpc/config.pseries
===================================================================
--- people/waldi/kernel/source/linux-2.6/debian/arch/powerpc/config.pseries 2005-08-14 13:26:38 UTC (rev 3856)
+++ people/waldi/kernel/source/linux-2.6/debian/arch/powerpc/config.pseries 2005-08-14 14:38:50 UTC (rev 3857)
@@ -1,2229 +0,0 @@
-#
-# Automatically generated make config: don't edit
-# Linux kernel version: 2.6.12
-# Fri Jul 15 18:10:25 2005
-#
-CONFIG_64BIT=y
-CONFIG_MMU=y
-CONFIG_RWSEM_XCHGADD_ALGORITHM=y
-CONFIG_GENERIC_CALIBRATE_DELAY=y
-CONFIG_GENERIC_ISA_DMA=y
-CONFIG_HAVE_DEC_LOCK=y
-CONFIG_EARLY_PRINTK=y
-CONFIG_COMPAT=y
-CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
-CONFIG_FORCE_MAX_ZONEORDER=13
-
-#
-# Code maturity level options
-#
-CONFIG_EXPERIMENTAL=y
-CONFIG_CLEAN_COMPILE=y
-CONFIG_LOCK_KERNEL=y
-CONFIG_INIT_ENV_ARG_LIMIT=32
-
-#
-# General setup
-#
-CONFIG_LOCALVERSION=""
-CONFIG_SWAP=y
-CONFIG_SYSVIPC=y
-CONFIG_POSIX_MQUEUE=y
-CONFIG_BSD_PROCESS_ACCT=y
-# CONFIG_BSD_PROCESS_ACCT_V3 is not set
-CONFIG_SYSCTL=y
-CONFIG_AUDIT=y
-CONFIG_AUDITSYSCALL=y
-CONFIG_HOTPLUG=y
-CONFIG_KOBJECT_UEVENT=y
-# CONFIG_IKCONFIG is not set
-CONFIG_CPUSETS=y
-# CONFIG_EMBEDDED is not set
-CONFIG_KALLSYMS=y
-# CONFIG_KALLSYMS_ALL is not set
-# CONFIG_KALLSYMS_EXTRA_PASS is not set
-CONFIG_PRINTK=y
-CONFIG_BUG=y
-CONFIG_BASE_FULL=y
-CONFIG_FUTEX=y
-CONFIG_EPOLL=y
-CONFIG_SHMEM=y
-CONFIG_CC_ALIGN_FUNCTIONS=0
-CONFIG_CC_ALIGN_LABELS=0
-CONFIG_CC_ALIGN_LOOPS=0
-CONFIG_CC_ALIGN_JUMPS=0
-# CONFIG_TINY_SHMEM is not set
-CONFIG_BASE_SMALL=0
-
-#
-# Loadable module support
-#
-CONFIG_MODULES=y
-CONFIG_MODULE_UNLOAD=y
-CONFIG_MODULE_FORCE_UNLOAD=y
-CONFIG_OBSOLETE_MODPARM=y
-CONFIG_MODVERSIONS=y
-# CONFIG_MODULE_SRCVERSION_ALL is not set
-CONFIG_KMOD=y
-CONFIG_STOP_MACHINE=y
-CONFIG_SYSVIPC_COMPAT=y
-
-#
-# Platform support
-#
-# CONFIG_PPC_ISERIES is not set
-CONFIG_PPC_MULTIPLATFORM=y
-CONFIG_PPC_PSERIES=y
-CONFIG_PPC_PMAC=y
-CONFIG_PPC_MAPLE=y
-CONFIG_PPC=y
-CONFIG_PPC64=y
-CONFIG_PPC_OF=y
-CONFIG_ALTIVEC=y
-CONFIG_PPC_SPLPAR=y
-CONFIG_IBMVIO=y
-CONFIG_U3_DART=y
-CONFIG_MPIC_BROKEN_U3=y
-CONFIG_PPC_PMAC64=y
-CONFIG_BOOTX_TEXT=y
-# CONFIG_POWER4_ONLY is not set
-CONFIG_IOMMU_VMERGE=y
-CONFIG_SMP=y
-CONFIG_NR_CPUS=32
-CONFIG_DISCONTIGMEM=y
-CONFIG_NUMA=y
-CONFIG_SCHED_SMT=y
-# CONFIG_PREEMPT is not set
-CONFIG_EEH=y
-CONFIG_GENERIC_HARDIRQS=y
-CONFIG_PPC_RTAS=y
-CONFIG_RTAS_PROC=y
-CONFIG_RTAS_FLASH=m
-CONFIG_SCANLOG=m
-CONFIG_LPARCFG=m
-CONFIG_SECCOMP=y
-CONFIG_ISA_DMA_API=y
-
-#
-# General setup
-#
-CONFIG_PCI=y
-CONFIG_PCI_DOMAINS=y
-CONFIG_BINFMT_ELF=y
-CONFIG_BINFMT_MISC=m
-CONFIG_PCI_LEGACY_PROC=y
-CONFIG_PCI_NAMES=y
-# CONFIG_PCI_DEBUG is not set
-# CONFIG_HOTPLUG_CPU is not set
-
-#
-# PCCARD (PCMCIA/CardBus) support
-#
-CONFIG_PCCARD=m
-# CONFIG_PCMCIA_DEBUG is not set
-CONFIG_PCMCIA=m
-CONFIG_CARDBUS=y
-
-#
-# PC-card bridges
-#
-CONFIG_YENTA=m
-CONFIG_PD6729=m
-CONFIG_I82092=m
-CONFIG_TCIC=m
-CONFIG_PCCARD_NONSTATIC=m
-
-#
-# PCI Hotplug Support
-#
-# CONFIG_HOTPLUG_PCI is not set
-CONFIG_PROC_DEVICETREE=y
-CONFIG_CMDLINE_BOOL=y
-CONFIG_CMDLINE="console=ttyS0,9600 console=tty0"
-
-#
-# Device Drivers
-#
-
-#
-# Generic Driver Options
-#
-CONFIG_STANDALONE=y
-CONFIG_PREVENT_FIRMWARE_BUILD=y
-CONFIG_FW_LOADER=m
-# CONFIG_DEBUG_DRIVER is not set
-
-#
-# Memory Technology Devices (MTD)
-#
-# CONFIG_MTD is not set
-
-#
-# Parallel port support
-#
-# CONFIG_PARPORT is not set
-
-#
-# Plug and Play support
-#
-
-#
-# Block devices
-#
-CONFIG_BLK_DEV_FD=m
-CONFIG_BLK_CPQ_DA=m
-CONFIG_BLK_CPQ_CISS_DA=m
-CONFIG_CISS_SCSI_TAPE=y
-CONFIG_BLK_DEV_DAC960=m
-CONFIG_BLK_DEV_UMEM=m
-# CONFIG_BLK_DEV_COW_COMMON is not set
-CONFIG_BLK_DEV_LOOP=m
-CONFIG_BLK_DEV_CRYPTOLOOP=m
-CONFIG_BLK_DEV_NBD=m
-CONFIG_BLK_DEV_SX8=m
-# CONFIG_BLK_DEV_UB is not set
-CONFIG_BLK_DEV_RAM=y
-CONFIG_BLK_DEV_RAM_COUNT=16
-CONFIG_BLK_DEV_RAM_SIZE=8192
-CONFIG_BLK_DEV_INITRD=y
-CONFIG_INITRAMFS_SOURCE=""
-CONFIG_CDROM_PKTCDVD=m
-CONFIG_CDROM_PKTCDVD_BUFFERS=8
-# CONFIG_CDROM_PKTCDVD_WCACHE is not set
-
-#
-# IO Schedulers
-#
-CONFIG_IOSCHED_NOOP=y
-CONFIG_IOSCHED_AS=y
-CONFIG_IOSCHED_DEADLINE=y
-CONFIG_IOSCHED_CFQ=y
-CONFIG_ATA_OVER_ETH=m
-
-#
-# ATA/ATAPI/MFM/RLL support
-#
-CONFIG_IDE=y
-CONFIG_BLK_DEV_IDE=y
-
-#
-# Please see Documentation/ide.txt for help/info on IDE drives
-#
-# CONFIG_BLK_DEV_IDE_SATA is not set
-CONFIG_BLK_DEV_IDEDISK=m
-# CONFIG_IDEDISK_MULTI_MODE is not set
-CONFIG_BLK_DEV_IDECS=m
-CONFIG_BLK_DEV_IDECD=m
-CONFIG_BLK_DEV_IDETAPE=m
-CONFIG_BLK_DEV_IDEFLOPPY=m
-CONFIG_BLK_DEV_IDESCSI=m
-# CONFIG_IDE_TASK_IOCTL is not set
-
-#
-# IDE chipset support/bugfixes
-#
-# CONFIG_IDE_GENERIC is not set
-CONFIG_BLK_DEV_IDEPCI=y
-CONFIG_IDEPCI_SHARE_IRQ=y
-# CONFIG_BLK_DEV_OFFBOARD is not set
-CONFIG_BLK_DEV_GENERIC=m
-# CONFIG_BLK_DEV_OPTI621 is not set
-CONFIG_BLK_DEV_SL82C105=m
-CONFIG_BLK_DEV_IDEDMA_PCI=y
-# CONFIG_BLK_DEV_IDEDMA_FORCED is not set
-CONFIG_IDEDMA_PCI_AUTO=y
-# CONFIG_IDEDMA_ONLYDISK is not set
-CONFIG_BLK_DEV_AEC62XX=m
-# CONFIG_BLK_DEV_ALI15X3 is not set
-# CONFIG_BLK_DEV_AMD74XX is not set
-CONFIG_BLK_DEV_CMD64X=m
-# CONFIG_BLK_DEV_TRIFLEX is not set
-# CONFIG_BLK_DEV_CY82C693 is not set
-# CONFIG_BLK_DEV_CS5520 is not set
-# CONFIG_BLK_DEV_CS5530 is not set
-CONFIG_BLK_DEV_HPT34X=m
-# CONFIG_HPT34X_AUTODMA is not set
-CONFIG_BLK_DEV_HPT366=m
-CONFIG_BLK_DEV_SC1200=m
-# CONFIG_BLK_DEV_PIIX is not set
-CONFIG_BLK_DEV_NS87415=m
-CONFIG_BLK_DEV_PDC202XX_OLD=m
-# CONFIG_PDC202XX_BURST is not set
-CONFIG_BLK_DEV_PDC202XX_NEW=m
-CONFIG_PDC202XX_FORCE=y
-# CONFIG_BLK_DEV_SVWKS is not set
-CONFIG_BLK_DEV_SIIMAGE=m
-# CONFIG_BLK_DEV_SLC90E66 is not set
-CONFIG_BLK_DEV_TRM290=m
-CONFIG_BLK_DEV_VIA82CXXX=m
-CONFIG_BLK_DEV_IDE_PMAC=y
-CONFIG_BLK_DEV_IDE_PMAC_ATA100FIRST=y
-CONFIG_BLK_DEV_IDEDMA_PMAC=y
-# CONFIG_BLK_DEV_IDE_PMAC_BLINK is not set
-# CONFIG_IDE_ARM is not set
-CONFIG_BLK_DEV_IDEDMA=y
-# CONFIG_IDEDMA_IVB is not set
-CONFIG_IDEDMA_AUTO=y
-# CONFIG_BLK_DEV_HD is not set
-
-#
-# SCSI device support
-#
-CONFIG_SCSI=m
-CONFIG_SCSI_PROC_FS=y
-
-#
-# SCSI support type (disk, tape, CD-ROM)
-#
-CONFIG_BLK_DEV_SD=m
-CONFIG_CHR_DEV_ST=m
-CONFIG_CHR_DEV_OSST=m
-CONFIG_BLK_DEV_SR=m
-CONFIG_BLK_DEV_SR_VENDOR=y
-CONFIG_CHR_DEV_SG=m
-CONFIG_CHR_DEV_SCH=m
-
-#
-# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
-#
-CONFIG_SCSI_MULTI_LUN=y
-# CONFIG_SCSI_CONSTANTS is not set
-CONFIG_SCSI_LOGGING=y
-
-#
-# SCSI Transport Attributes
-#
-CONFIG_SCSI_SPI_ATTRS=m
-CONFIG_SCSI_FC_ATTRS=m
-CONFIG_SCSI_ISCSI_ATTRS=m
-
-#
-# SCSI low-level drivers
-#
-CONFIG_BLK_DEV_3W_XXXX_RAID=m
-CONFIG_SCSI_3W_9XXX=m
-CONFIG_SCSI_ACARD=m
-CONFIG_SCSI_AACRAID=m
-CONFIG_SCSI_AIC7XXX=m
-CONFIG_AIC7XXX_CMDS_PER_DEVICE=32
-CONFIG_AIC7XXX_RESET_DELAY_MS=15000
-CONFIG_AIC7XXX_DEBUG_ENABLE=y
-CONFIG_AIC7XXX_DEBUG_MASK=0
-CONFIG_AIC7XXX_REG_PRETTY_PRINT=y
-CONFIG_SCSI_AIC7XXX_OLD=m
-CONFIG_SCSI_AIC79XX=m
-CONFIG_AIC79XX_CMDS_PER_DEVICE=32
-CONFIG_AIC79XX_RESET_DELAY_MS=15000
-# CONFIG_AIC79XX_ENABLE_RD_STRM is not set
-CONFIG_AIC79XX_DEBUG_ENABLE=y
-CONFIG_AIC79XX_DEBUG_MASK=0
-CONFIG_AIC79XX_REG_PRETTY_PRINT=y
-CONFIG_MEGARAID_NEWGEN=y
-CONFIG_MEGARAID_MM=m
-CONFIG_MEGARAID_MAILBOX=m
-CONFIG_MEGARAID_LEGACY=m
-CONFIG_SCSI_SATA=y
-CONFIG_SCSI_SATA_AHCI=m
-CONFIG_SCSI_SATA_SVW=m
-# CONFIG_SCSI_ATA_PIIX is not set
-# CONFIG_SCSI_SATA_NV is not set
-CONFIG_SCSI_SATA_PROMISE=m
-CONFIG_SCSI_SATA_QSTOR=m
-CONFIG_SCSI_SATA_SX4=m
-CONFIG_SCSI_SATA_SIL=m
-CONFIG_SCSI_SATA_SIS=m
-CONFIG_SCSI_SATA_ULI=m
-CONFIG_SCSI_SATA_VIA=m
-CONFIG_SCSI_SATA_VITESSE=m
-CONFIG_SCSI_BUSLOGIC=m
-# CONFIG_SCSI_OMIT_FLASHPOINT is not set
-CONFIG_SCSI_DMX3191D=m
-CONFIG_SCSI_EATA=m
-# CONFIG_SCSI_EATA_TAGGED_QUEUE is not set
-# CONFIG_SCSI_EATA_LINKED_COMMANDS is not set
-CONFIG_SCSI_EATA_MAX_TAGS=16
-# CONFIG_SCSI_FUTURE_DOMAIN is not set
-# CONFIG_SCSI_GDTH is not set
-CONFIG_SCSI_IPS=m
-# CONFIG_SCSI_INITIO is not set
-CONFIG_SCSI_INIA100=m
-CONFIG_SCSI_SYM53C8XX_2=m
-CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1
-CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16
-CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
-# CONFIG_SCSI_SYM53C8XX_IOMAPPED is not set
-CONFIG_SCSI_IPR=m
-# CONFIG_SCSI_IPR_TRACE is not set
-# CONFIG_SCSI_IPR_DUMP is not set
-CONFIG_SCSI_QLOGIC_FC=m
-# CONFIG_SCSI_QLOGIC_FC_FIRMWARE is not set
-CONFIG_SCSI_QLOGIC_1280=m
-CONFIG_SCSI_QLOGIC_1280_1040=y
-CONFIG_SCSI_LPFC=m
-CONFIG_SCSI_DC395x=m
-CONFIG_SCSI_DC390T=m
-# CONFIG_SCSI_DEBUG is not set
-
-#
-# PCMCIA SCSI adapter support
-#
-# CONFIG_PCMCIA_FDOMAIN is not set
-CONFIG_PCMCIA_QLOGIC=m
-CONFIG_PCMCIA_SYM53C500=m
-
-#
-# Multi-device support (RAID and LVM)
-#
-CONFIG_MD=y
-CONFIG_BLK_DEV_MD=m
-CONFIG_MD_LINEAR=m
-CONFIG_MD_RAID0=m
-CONFIG_MD_RAID1=m
-CONFIG_MD_RAID10=m
-CONFIG_MD_RAID5=m
-CONFIG_MD_RAID6=m
-CONFIG_MD_MULTIPATH=m
-CONFIG_MD_FAULTY=m
-CONFIG_BLK_DEV_DM=m
-CONFIG_DM_CRYPT=m
-CONFIG_DM_SNAPSHOT=m
-CONFIG_DM_MIRROR=m
-CONFIG_DM_ZERO=m
-CONFIG_DM_MULTIPATH=m
-CONFIG_DM_MULTIPATH_EMC=m
-
-#
-# Fusion MPT device support
-#
-CONFIG_FUSION=m
-CONFIG_FUSION_MAX_SGE=40
-CONFIG_FUSION_CTL=m
-# CONFIG_FUSION_LAN is not set
-
-#
-# IEEE 1394 (FireWire) support
-#
-CONFIG_IEEE1394=m
-
-#
-# Subsystem Options
-#
-# CONFIG_IEEE1394_VERBOSEDEBUG is not set
-CONFIG_IEEE1394_OUI_DB=y
-CONFIG_IEEE1394_EXTRA_CONFIG_ROMS=y
-CONFIG_IEEE1394_CONFIG_ROM_IP1394=y
-
-#
-# Device Drivers
-#
-CONFIG_IEEE1394_PCILYNX=m
-CONFIG_IEEE1394_OHCI1394=m
-
-#
-# Protocol Drivers
-#
-CONFIG_IEEE1394_VIDEO1394=m
-CONFIG_IEEE1394_SBP2=m
-CONFIG_IEEE1394_SBP2_PHYS_DMA=y
-CONFIG_IEEE1394_ETH1394=m
-CONFIG_IEEE1394_DV1394=m
-CONFIG_IEEE1394_RAWIO=m
-CONFIG_IEEE1394_CMP=m
-CONFIG_IEEE1394_AMDTP=m
-
-#
-# I2O device support
-#
-CONFIG_I2O=m
-CONFIG_I2O_CONFIG=m
-CONFIG_I2O_BLOCK=m
-CONFIG_I2O_SCSI=m
-CONFIG_I2O_PROC=m
-
-#
-# Macintosh device drivers
-#
-# CONFIG_ADB is not set
-CONFIG_ADB_PMU=y
-CONFIG_PMAC_SMU=y
-# CONFIG_PMAC_PBOOK is not set
-# CONFIG_PMAC_BACKLIGHT is not set
-# CONFIG_THERM_PM72 is not set
-
-#
-# Networking support
-#
-CONFIG_NET=y
-
-#
-# Networking options
-#
-CONFIG_PACKET=m
-# CONFIG_PACKET_MMAP is not set
-CONFIG_UNIX=m
-CONFIG_NET_KEY=m
-CONFIG_INET=y
-CONFIG_IP_MULTICAST=y
-CONFIG_IP_ADVANCED_ROUTER=y
-CONFIG_IP_MULTIPLE_TABLES=y
-CONFIG_IP_ROUTE_FWMARK=y
-CONFIG_IP_ROUTE_MULTIPATH=y
-# CONFIG_IP_ROUTE_MULTIPATH_CACHED is not set
-CONFIG_IP_ROUTE_VERBOSE=y
-# CONFIG_IP_PNP is not set
-CONFIG_NET_IPIP=m
-CONFIG_NET_IPGRE=m
-CONFIG_NET_IPGRE_BROADCAST=y
-CONFIG_IP_MROUTE=y
-CONFIG_IP_PIMSM_V1=y
-CONFIG_IP_PIMSM_V2=y
-CONFIG_ARPD=y
-# CONFIG_SYN_COOKIES is not set
-CONFIG_INET_AH=m
-CONFIG_INET_ESP=m
-CONFIG_INET_IPCOMP=m
-CONFIG_INET_TUNNEL=m
-CONFIG_IP_TCPDIAG=m
-CONFIG_IP_TCPDIAG_IPV6=y
-
-#
-# IP: Virtual Server Configuration
-#
-CONFIG_IP_VS=m
-# CONFIG_IP_VS_DEBUG is not set
-CONFIG_IP_VS_TAB_BITS=12
-
-#
-# IPVS transport protocol load balancing support
-#
-CONFIG_IP_VS_PROTO_TCP=y
-CONFIG_IP_VS_PROTO_UDP=y
-CONFIG_IP_VS_PROTO_ESP=y
-CONFIG_IP_VS_PROTO_AH=y
-
-#
-# IPVS scheduler
-#
-CONFIG_IP_VS_RR=m
-CONFIG_IP_VS_WRR=m
-CONFIG_IP_VS_LC=m
-CONFIG_IP_VS_WLC=m
-CONFIG_IP_VS_LBLC=m
-CONFIG_IP_VS_LBLCR=m
-CONFIG_IP_VS_DH=m
-CONFIG_IP_VS_SH=m
-CONFIG_IP_VS_SED=m
-CONFIG_IP_VS_NQ=m
-
-#
-# IPVS application helper
-#
-CONFIG_IP_VS_FTP=m
-CONFIG_IPV6=m
-CONFIG_IPV6_PRIVACY=y
-CONFIG_INET6_AH=m
-CONFIG_INET6_ESP=m
-CONFIG_INET6_IPCOMP=m
-CONFIG_INET6_TUNNEL=m
-CONFIG_IPV6_TUNNEL=m
-CONFIG_NETFILTER=y
-# CONFIG_NETFILTER_DEBUG is not set
-CONFIG_BRIDGE_NETFILTER=y
-
-#
-# IP: Netfilter Configuration
-#
-CONFIG_IP_NF_CONNTRACK=m
-# CONFIG_IP_NF_CT_ACCT is not set
-CONFIG_IP_NF_CONNTRACK_MARK=y
-CONFIG_IP_NF_CT_PROTO_SCTP=m
-CONFIG_IP_NF_FTP=m
-CONFIG_IP_NF_IRC=m
-CONFIG_IP_NF_TFTP=m
-CONFIG_IP_NF_AMANDA=m
-CONFIG_IP_NF_QUEUE=m
-CONFIG_IP_NF_IPTABLES=m
-CONFIG_IP_NF_MATCH_LIMIT=m
-# CONFIG_IP_NF_MATCH_IPRANGE is not set
-CONFIG_IP_NF_MATCH_MAC=m
-CONFIG_IP_NF_MATCH_PKTTYPE=m
-CONFIG_IP_NF_MATCH_MARK=m
-CONFIG_IP_NF_MATCH_MULTIPORT=m
-CONFIG_IP_NF_MATCH_TOS=m
-CONFIG_IP_NF_MATCH_RECENT=m
-CONFIG_IP_NF_MATCH_ECN=m
-CONFIG_IP_NF_MATCH_DSCP=m
-# CONFIG_IP_NF_MATCH_AH_ESP is not set
-CONFIG_IP_NF_MATCH_LENGTH=m
-CONFIG_IP_NF_MATCH_TTL=m
-CONFIG_IP_NF_MATCH_TCPMSS=m
-CONFIG_IP_NF_MATCH_HELPER=m
-CONFIG_IP_NF_MATCH_STATE=m
-CONFIG_IP_NF_MATCH_CONNTRACK=m
-CONFIG_IP_NF_MATCH_OWNER=m
-# CONFIG_IP_NF_MATCH_PHYSDEV is not set
-CONFIG_IP_NF_MATCH_ADDRTYPE=m
-CONFIG_IP_NF_MATCH_REALM=m
-CONFIG_IP_NF_MATCH_SCTP=m
-CONFIG_IP_NF_MATCH_COMMENT=m
-CONFIG_IP_NF_MATCH_CONNMARK=m
-CONFIG_IP_NF_MATCH_HASHLIMIT=m
-CONFIG_IP_NF_FILTER=m
-CONFIG_IP_NF_TARGET_REJECT=m
-CONFIG_IP_NF_TARGET_LOG=m
-CONFIG_IP_NF_TARGET_ULOG=m
-CONFIG_IP_NF_TARGET_TCPMSS=m
-CONFIG_IP_NF_NAT=m
-CONFIG_IP_NF_NAT_NEEDED=y
-CONFIG_IP_NF_TARGET_MASQUERADE=m
-CONFIG_IP_NF_TARGET_REDIRECT=m
-# CONFIG_IP_NF_TARGET_NETMAP is not set
-# CONFIG_IP_NF_TARGET_SAME is not set
-CONFIG_IP_NF_NAT_SNMP_BASIC=m
-CONFIG_IP_NF_NAT_IRC=m
-CONFIG_IP_NF_NAT_FTP=m
-CONFIG_IP_NF_NAT_TFTP=m
-CONFIG_IP_NF_NAT_AMANDA=m
-CONFIG_IP_NF_MANGLE=m
-CONFIG_IP_NF_TARGET_TOS=m
-CONFIG_IP_NF_TARGET_ECN=m
-CONFIG_IP_NF_TARGET_DSCP=m
-CONFIG_IP_NF_TARGET_MARK=m
-# CONFIG_IP_NF_TARGET_CLASSIFY is not set
-CONFIG_IP_NF_TARGET_CONNMARK=m
-CONFIG_IP_NF_TARGET_CLUSTERIP=m
-CONFIG_IP_NF_RAW=m
-CONFIG_IP_NF_TARGET_NOTRACK=m
-CONFIG_IP_NF_ARPTABLES=m
-CONFIG_IP_NF_ARPFILTER=m
-CONFIG_IP_NF_ARP_MANGLE=m
-
-#
-# IPv6: Netfilter Configuration (EXPERIMENTAL)
-#
-# CONFIG_IP6_NF_QUEUE is not set
-# CONFIG_IP6_NF_IPTABLES is not set
-
-#
-# DECnet: Netfilter Configuration
-#
-# CONFIG_DECNET_NF_GRABULATOR is not set
-
-#
-# Bridge: Netfilter Configuration
-#
-# CONFIG_BRIDGE_NF_EBTABLES is not set
-CONFIG_XFRM=y
-CONFIG_XFRM_USER=m
-
-#
-# SCTP Configuration (EXPERIMENTAL)
-#
-CONFIG_IP_SCTP=m
-# CONFIG_SCTP_DBG_MSG is not set
-# CONFIG_SCTP_DBG_OBJCNT is not set
-# CONFIG_SCTP_HMAC_NONE is not set
-# CONFIG_SCTP_HMAC_SHA1 is not set
-CONFIG_SCTP_HMAC_MD5=y
-CONFIG_ATM=m
-CONFIG_ATM_CLIP=m
-CONFIG_ATM_CLIP_NO_ICMP=y
-CONFIG_ATM_LANE=m
-CONFIG_ATM_MPOA=m
-CONFIG_ATM_BR2684=m
-# CONFIG_ATM_BR2684_IPFILTER is not set
-CONFIG_BRIDGE=m
-CONFIG_VLAN_8021Q=m
-CONFIG_DECNET=m
-CONFIG_DECNET_ROUTER=y
-CONFIG_DECNET_ROUTE_FWMARK=y
-CONFIG_LLC=y
-CONFIG_LLC2=m
-CONFIG_IPX=m
-CONFIG_IPX_INTERN=y
-CONFIG_ATALK=m
-CONFIG_DEV_APPLETALK=y
-CONFIG_IPDDP=m
-CONFIG_IPDDP_ENCAP=y
-CONFIG_IPDDP_DECAP=y
-CONFIG_X25=m
-CONFIG_LAPB=m
-CONFIG_NET_DIVERT=y
-CONFIG_ECONET=m
-CONFIG_ECONET_AUNUDP=y
-CONFIG_ECONET_NATIVE=y
-CONFIG_WAN_ROUTER=m
-
-#
-# QoS and/or fair queueing
-#
-CONFIG_NET_SCHED=y
-CONFIG_NET_SCH_CLK_JIFFIES=y
-# CONFIG_NET_SCH_CLK_GETTIMEOFDAY is not set
-# CONFIG_NET_SCH_CLK_CPU is not set
-CONFIG_NET_SCH_CBQ=m
-CONFIG_NET_SCH_HTB=m
-CONFIG_NET_SCH_HFSC=m
-CONFIG_NET_SCH_ATM=m
-CONFIG_NET_SCH_PRIO=m
-CONFIG_NET_SCH_RED=m
-CONFIG_NET_SCH_SFQ=m
-CONFIG_NET_SCH_TEQL=m
-CONFIG_NET_SCH_TBF=m
-CONFIG_NET_SCH_GRED=m
-CONFIG_NET_SCH_DSMARK=m
-CONFIG_NET_SCH_NETEM=m
-CONFIG_NET_SCH_INGRESS=m
-CONFIG_NET_QOS=y
-CONFIG_NET_ESTIMATOR=y
-CONFIG_NET_CLS=y
-CONFIG_NET_CLS_BASIC=m
-CONFIG_NET_CLS_TCINDEX=m
-CONFIG_NET_CLS_ROUTE4=m
-CONFIG_NET_CLS_ROUTE=y
-CONFIG_NET_CLS_FW=m
-CONFIG_NET_CLS_U32=m
-# CONFIG_CLS_U32_PERF is not set
-# CONFIG_NET_CLS_IND is not set
-CONFIG_CLS_U32_MARK=y
-CONFIG_NET_CLS_RSVP=m
-CONFIG_NET_CLS_RSVP6=m
-CONFIG_NET_EMATCH=y
-CONFIG_NET_EMATCH_STACK=32
-CONFIG_NET_EMATCH_CMP=m
-CONFIG_NET_EMATCH_NBYTE=m
-CONFIG_NET_EMATCH_U32=m
-CONFIG_NET_EMATCH_META=m
-# CONFIG_NET_CLS_ACT is not set
-CONFIG_NET_CLS_POLICE=y
-
-#
-# Network testing
-#
-CONFIG_NET_PKTGEN=m
-CONFIG_NETPOLL=y
-CONFIG_NETPOLL_RX=y
-CONFIG_NETPOLL_TRAP=y
-CONFIG_NET_POLL_CONTROLLER=y
-CONFIG_HAMRADIO=y
-
-#
-# Packet Radio protocols
-#
-CONFIG_AX25=m
-CONFIG_AX25_DAMA_SLAVE=y
-CONFIG_NETROM=m
-CONFIG_ROSE=m
-
-#
-# AX.25 network device drivers
-#
-CONFIG_BPQETHER=m
-CONFIG_BAYCOM_SER_FDX=m
-CONFIG_BAYCOM_SER_HDX=m
-CONFIG_YAM=m
-CONFIG_IRDA=m
-
-#
-# IrDA protocols
-#
-CONFIG_IRLAN=m
-CONFIG_IRNET=m
-CONFIG_IRCOMM=m
-CONFIG_IRDA_ULTRA=y
-
-#
-# IrDA options
-#
-CONFIG_IRDA_CACHE_LAST_LSAP=y
-CONFIG_IRDA_FAST_RR=y
-CONFIG_IRDA_DEBUG=y
-
-#
-# Infrared-port device drivers
-#
-
-#
-# SIR device drivers
-#
-CONFIG_IRTTY_SIR=m
-
-#
-# Dongle support
-#
-# CONFIG_DONGLE is not set
-
-#
-# Old SIR device drivers
-#
-
-#
-# Old Serial dongle support
-#
-
-#
-# FIR device drivers
-#
-CONFIG_USB_IRDA=m
-# CONFIG_SIGMATEL_FIR is not set
-CONFIG_NSC_FIR=m
-CONFIG_WINBOND_FIR=m
-CONFIG_SMC_IRCC_FIR=m
-CONFIG_ALI_FIR=m
-# CONFIG_VLSI_FIR is not set
-CONFIG_VIA_FIR=m
-CONFIG_BT=m
-CONFIG_BT_L2CAP=m
-CONFIG_BT_SCO=m
-CONFIG_BT_RFCOMM=m
-CONFIG_BT_RFCOMM_TTY=y
-CONFIG_BT_BNEP=m
-CONFIG_BT_BNEP_MC_FILTER=y
-CONFIG_BT_BNEP_PROTO_FILTER=y
-CONFIG_BT_CMTP=m
-CONFIG_BT_HIDP=m
-
-#
-# Bluetooth device drivers
-#
-CONFIG_BT_HCIUSB=m
-CONFIG_BT_HCIUSB_SCO=y
-CONFIG_BT_HCIUART=m
-CONFIG_BT_HCIUART_H4=y
-CONFIG_BT_HCIUART_BCSP=y
-CONFIG_BT_HCIUART_BCSP_TXCRC=y
-CONFIG_BT_HCIBCM203X=m
-CONFIG_BT_HCIBPA10X=m
-CONFIG_BT_HCIBFUSB=m
-CONFIG_BT_HCIDTL1=m
-CONFIG_BT_HCIBT3C=m
-CONFIG_BT_HCIBLUECARD=m
-CONFIG_BT_HCIBTUART=m
-CONFIG_BT_HCIVHCI=m
-CONFIG_NETDEVICES=y
-CONFIG_DUMMY=m
-CONFIG_BONDING=m
-CONFIG_EQUALIZER=m
-CONFIG_TUN=m
-
-#
-# ARCnet devices
-#
-CONFIG_ARCNET=m
-CONFIG_ARCNET_1201=m
-CONFIG_ARCNET_1051=m
-CONFIG_ARCNET_RAW=m
-CONFIG_ARCNET_CAP=m
-# CONFIG_ARCNET_COM90xx is not set
-CONFIG_ARCNET_COM90xxIO=m
-# CONFIG_ARCNET_RIM_I is not set
-CONFIG_ARCNET_COM20020=m
-CONFIG_ARCNET_COM20020_PCI=m
-
-#
-# Ethernet (10 or 100Mbit)
-#
-CONFIG_NET_ETHERNET=y
-CONFIG_MII=y
-CONFIG_HAPPYMEAL=m
-CONFIG_SUNGEM=m
-CONFIG_NET_VENDOR_3COM=y
-CONFIG_VORTEX=m
-CONFIG_TYPHOON=m
-
-#
-# Tulip family network device support
-#
-CONFIG_NET_TULIP=y
-CONFIG_DE2104X=m
-CONFIG_TULIP=m
-# CONFIG_TULIP_MWI is not set
-# CONFIG_TULIP_MMIO is not set
-# CONFIG_TULIP_NAPI is not set
-CONFIG_DE4X5=m
-CONFIG_WINBOND_840=m
-CONFIG_DM9102=m
-CONFIG_PCMCIA_XIRCOM=m
-# CONFIG_HP100 is not set
-CONFIG_IBMVETH=m
-CONFIG_NET_PCI=y
-CONFIG_PCNET32=m
-# CONFIG_AMD8111_ETH is not set
-CONFIG_ADAPTEC_STARFIRE=m
-# CONFIG_ADAPTEC_STARFIRE_NAPI is not set
-CONFIG_B44=m
-# CONFIG_FORCEDETH is not set
-CONFIG_EEPRO100=m
-CONFIG_E100=m
-CONFIG_FEALNX=m
-CONFIG_NATSEMI=m
-CONFIG_NE2K_PCI=m
-CONFIG_8139CP=m
-CONFIG_8139TOO=m
-CONFIG_8139TOO_PIO=y
-# CONFIG_8139TOO_TUNE_TWISTER is not set
-CONFIG_8139TOO_8129=y
-# CONFIG_8139_OLD_RX_RESET is not set
-CONFIG_SIS900=m
-CONFIG_EPIC100=m
-CONFIG_SUNDANCE=m
-CONFIG_SUNDANCE_MMIO=y
-CONFIG_VIA_RHINE=m
-CONFIG_VIA_RHINE_MMIO=y
-
-#
-# Ethernet (1000 Mbit)
-#
-CONFIG_DL2K=m
-CONFIG_E1000=m
-# CONFIG_E1000_NAPI is not set
-CONFIG_NS83820=m
-CONFIG_HAMACHI=m
-CONFIG_YELLOWFIN=m
-CONFIG_R8169=m
-# CONFIG_R8169_NAPI is not set
-CONFIG_R8169_VLAN=y
-CONFIG_SK98LIN=m
-CONFIG_VIA_VELOCITY=m
-# CONFIG_TIGON3 is not set
-CONFIG_BNX2=m
-CONFIG_MV643XX_ETH=m
-# CONFIG_MV643XX_ETH_0 is not set
-CONFIG_MV643XX_ETH_1=y
-# CONFIG_MV643XX_ETH_2 is not set
-
-#
-# Ethernet (10000 Mbit)
-#
-CONFIG_IXGB=m
-# CONFIG_IXGB_NAPI is not set
-CONFIG_S2IO=m
-# CONFIG_S2IO_NAPI is not set
-# CONFIG_2BUFF_MODE is not set
-
-#
-# Token Ring devices
-#
-CONFIG_TR=y
-CONFIG_IBMOL=m
-CONFIG_3C359=m
-CONFIG_TMS380TR=m
-CONFIG_TMSPCI=m
-CONFIG_ABYSS=m
-
-#
-# Wireless LAN (non-hamradio)
-#
-CONFIG_NET_RADIO=y
-
-#
-# Obsolete Wireless cards support (pre-802.11)
-#
-CONFIG_STRIP=m
-CONFIG_PCMCIA_WAVELAN=m
-CONFIG_PCMCIA_NETWAVE=m
-
-#
-# Wireless 802.11 Frequency Hopping cards support
-#
-CONFIG_PCMCIA_RAYCS=m
-
-#
-# Wireless 802.11b ISA/PCI cards support
-#
-CONFIG_HERMES=m
-CONFIG_APPLE_AIRPORT=m
-CONFIG_PLX_HERMES=m
-CONFIG_TMD_HERMES=m
-CONFIG_PCI_HERMES=m
-CONFIG_ATMEL=m
-# CONFIG_PCI_ATMEL is not set
-
-#
-# Wireless 802.11b Pcmcia/Cardbus cards support
-#
-CONFIG_PCMCIA_HERMES=m
-CONFIG_AIRO_CS=m
-CONFIG_PCMCIA_ATMEL=m
-CONFIG_PCMCIA_WL3501=m
-
-#
-# Prism GT/Duette 802.11(a/b/g) PCI/Cardbus support
-#
-CONFIG_PRISM54=m
-CONFIG_NET_WIRELESS=y
-
-#
-# PCMCIA network device support
-#
-CONFIG_NET_PCMCIA=y
-CONFIG_PCMCIA_3C589=m
-CONFIG_PCMCIA_3C574=m
-CONFIG_PCMCIA_FMVJ18X=m
-CONFIG_PCMCIA_PCNET=m
-CONFIG_PCMCIA_NMCLAN=m
-CONFIG_PCMCIA_SMC91C92=m
-CONFIG_PCMCIA_XIRC2PS=m
-CONFIG_PCMCIA_AXNET=m
-CONFIG_ARCNET_COM20020_CS=m
-
-#
-# Wan interfaces
-#
-CONFIG_WAN=y
-CONFIG_DSCC4=m
-# CONFIG_DSCC4_PCISYNC is not set
-# CONFIG_DSCC4_PCI_RST is not set
-CONFIG_LANMEDIA=m
-CONFIG_SYNCLINK_SYNCPPP=m
-CONFIG_HDLC=m
-CONFIG_HDLC_RAW=y
-CONFIG_HDLC_RAW_ETH=y
-CONFIG_HDLC_CISCO=y
-CONFIG_HDLC_FR=y
-CONFIG_HDLC_PPP=y
-CONFIG_HDLC_X25=y
-CONFIG_PCI200SYN=m
-CONFIG_WANXL=m
-CONFIG_PC300=m
-CONFIG_PC300_MLPPP=y
-CONFIG_FARSYNC=m
-CONFIG_DLCI=m
-CONFIG_DLCI_COUNT=24
-CONFIG_DLCI_MAX=8
-CONFIG_WAN_ROUTER_DRIVERS=y
-CONFIG_CYCLADES_SYNC=m
-CONFIG_CYCLOMX_X25=y
-CONFIG_LAPBETHER=m
-CONFIG_X25_ASY=m
-
-#
-# ATM drivers
-#
-CONFIG_ATM_TCP=m
-CONFIG_ATM_LANAI=m
-CONFIG_ATM_ENI=m
-# CONFIG_ATM_ENI_DEBUG is not set
-# CONFIG_ATM_ENI_TUNE_BURST is not set
-CONFIG_ATM_FIRESTREAM=m
-CONFIG_ATM_ZATM=m
-CONFIG_ATM_ZATM_DEBUG=y
-CONFIG_ATM_IDT77252=m
-# CONFIG_ATM_IDT77252_DEBUG is not set
-# CONFIG_ATM_IDT77252_RCV_ALL is not set
-CONFIG_ATM_IDT77252_USE_SUNI=y
-CONFIG_ATM_AMBASSADOR=m
-# CONFIG_ATM_AMBASSADOR_DEBUG is not set
-CONFIG_ATM_HORIZON=m
-# CONFIG_ATM_HORIZON_DEBUG is not set
-CONFIG_ATM_FORE200E_MAYBE=m
-CONFIG_ATM_FORE200E_PCA=y
-CONFIG_ATM_FORE200E_PCA_DEFAULT_FW=y
-CONFIG_ATM_FORE200E_USE_TASKLET=y
-CONFIG_ATM_FORE200E_TX_RETRY=16
-CONFIG_ATM_FORE200E_DEBUG=0
-CONFIG_ATM_FORE200E=m
-CONFIG_ATM_HE=m
-# CONFIG_ATM_HE_USE_SUNI is not set
-CONFIG_FDDI=y
-CONFIG_DEFXX=m
-CONFIG_SKFP=m
-CONFIG_HIPPI=y
-# CONFIG_ROADRUNNER is not set
-CONFIG_PPP=m
-CONFIG_PPP_MULTILINK=y
-CONFIG_PPP_FILTER=y
-CONFIG_PPP_ASYNC=m
-CONFIG_PPP_SYNC_TTY=m
-CONFIG_PPP_DEFLATE=m
-CONFIG_PPP_BSDCOMP=m
-CONFIG_PPPOE=m
-CONFIG_PPPOATM=m
-CONFIG_SLIP=m
-# CONFIG_SLIP_COMPRESSED is not set
-# CONFIG_SLIP_SMART is not set
-# CONFIG_SLIP_MODE_SLIP6 is not set
-CONFIG_NET_FC=y
-CONFIG_SHAPER=m
-CONFIG_NETCONSOLE=m
-
-#
-# ISDN subsystem
-#
-CONFIG_ISDN=m
-
-#
-# Old ISDN4Linux
-#
-# CONFIG_ISDN_I4L is not set
-
-#
-# CAPI subsystem
-#
-CONFIG_ISDN_CAPI=m
-# CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON is not set
-CONFIG_ISDN_CAPI_MIDDLEWARE=y
-CONFIG_ISDN_CAPI_CAPI20=m
-# CONFIG_ISDN_CAPI_CAPIFS_BOOL is not set
-
-#
-# CAPI hardware drivers
-#
-
-#
-# Active AVM cards
-#
-CONFIG_CAPI_AVM=y
-CONFIG_ISDN_DRV_AVMB1_B1PCI=m
-CONFIG_ISDN_DRV_AVMB1_B1PCIV4=y
-CONFIG_ISDN_DRV_AVMB1_B1PCMCIA=m
-CONFIG_ISDN_DRV_AVMB1_AVM_CS=m
-CONFIG_ISDN_DRV_AVMB1_T1PCI=m
-CONFIG_ISDN_DRV_AVMB1_C4=m
-
-#
-# Active Eicon DIVA Server cards
-#
-CONFIG_CAPI_EICON=y
-CONFIG_ISDN_DIVAS=m
-CONFIG_ISDN_DIVAS_BRIPCI=y
-CONFIG_ISDN_DIVAS_PRIPCI=y
-CONFIG_ISDN_DIVAS_DIVACAPI=m
-CONFIG_ISDN_DIVAS_USERIDI=m
-CONFIG_ISDN_DIVAS_MAINT=m
-
-#
-# Telephony Support
-#
-CONFIG_PHONE=m
-CONFIG_PHONE_IXJ=m
-CONFIG_PHONE_IXJ_PCMCIA=m
-
-#
-# Input device support
-#
-CONFIG_INPUT=y
-
-#
-# Userland interfaces
-#
-CONFIG_INPUT_MOUSEDEV=y
-CONFIG_INPUT_MOUSEDEV_PSAUX=y
-CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
-CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
-CONFIG_INPUT_JOYDEV=m
-CONFIG_INPUT_TSDEV=m
-CONFIG_INPUT_TSDEV_SCREEN_X=240
-CONFIG_INPUT_TSDEV_SCREEN_Y=320
-CONFIG_INPUT_EVDEV=m
-CONFIG_INPUT_EVBUG=m
-
-#
-# Input Device Drivers
-#
-CONFIG_INPUT_KEYBOARD=y
-CONFIG_KEYBOARD_ATKBD=m
-# CONFIG_KEYBOARD_SUNKBD is not set
-# CONFIG_KEYBOARD_LKKBD is not set
-# CONFIG_KEYBOARD_XTKBD is not set
-# CONFIG_KEYBOARD_NEWTON is not set
-CONFIG_INPUT_MOUSE=y
-CONFIG_MOUSE_PS2=m
-# CONFIG_MOUSE_SERIAL is not set
-# CONFIG_MOUSE_VSXXXAA is not set
-CONFIG_INPUT_JOYSTICK=y
-CONFIG_JOYSTICK_ANALOG=m
-CONFIG_JOYSTICK_A3D=m
-CONFIG_JOYSTICK_ADI=m
-CONFIG_JOYSTICK_COBRA=m
-CONFIG_JOYSTICK_GF2K=m
-CONFIG_JOYSTICK_GRIP=m
-CONFIG_JOYSTICK_GRIP_MP=m
-CONFIG_JOYSTICK_GUILLEMOT=m
-CONFIG_JOYSTICK_INTERACT=m
-CONFIG_JOYSTICK_SIDEWINDER=m
-CONFIG_JOYSTICK_TMDC=m
-CONFIG_JOYSTICK_IFORCE=m
-CONFIG_JOYSTICK_IFORCE_USB=y
-CONFIG_JOYSTICK_IFORCE_232=y
-CONFIG_JOYSTICK_WARRIOR=m
-CONFIG_JOYSTICK_MAGELLAN=m
-CONFIG_JOYSTICK_SPACEORB=m
-CONFIG_JOYSTICK_SPACEBALL=m
-CONFIG_JOYSTICK_STINGER=m
-CONFIG_JOYSTICK_TWIDJOY=m
-CONFIG_JOYSTICK_JOYDUMP=m
-CONFIG_INPUT_TOUCHSCREEN=y
-CONFIG_TOUCHSCREEN_GUNZE=m
-CONFIG_TOUCHSCREEN_ELO=m
-CONFIG_TOUCHSCREEN_MTOUCH=m
-CONFIG_TOUCHSCREEN_MK712=m
-CONFIG_INPUT_MISC=y
-CONFIG_INPUT_PCSPKR=m
-CONFIG_INPUT_UINPUT=m
-
-#
-# Hardware I/O ports
-#
-CONFIG_SERIO=m
-CONFIG_SERIO_I8042=m
-CONFIG_SERIO_SERPORT=m
-# CONFIG_SERIO_PCIPS2 is not set
-CONFIG_SERIO_LIBPS2=m
-CONFIG_SERIO_RAW=m
-CONFIG_GAMEPORT=m
-CONFIG_GAMEPORT_NS558=m
-CONFIG_GAMEPORT_L4=m
-CONFIG_GAMEPORT_EMU10K1=m
-CONFIG_GAMEPORT_VORTEX=m
-CONFIG_GAMEPORT_FM801=m
-CONFIG_GAMEPORT_CS461X=m
-
-#
-# Character devices
-#
-CONFIG_VT=y
-CONFIG_VT_CONSOLE=y
-CONFIG_HW_CONSOLE=y
-# CONFIG_SERIAL_NONSTANDARD is not set
-
-#
-# Serial drivers
-#
-CONFIG_SERIAL_8250=y
-CONFIG_SERIAL_8250_CONSOLE=y
-CONFIG_SERIAL_8250_CS=m
-CONFIG_SERIAL_8250_NR_UARTS=4
-# CONFIG_SERIAL_8250_EXTENDED is not set
-
-#
-# Non-8250 serial port support
-#
-CONFIG_SERIAL_CORE=y
-CONFIG_SERIAL_CORE_CONSOLE=y
-CONFIG_SERIAL_PMACZILOG=y
-CONFIG_SERIAL_PMACZILOG_CONSOLE=y
-# CONFIG_SERIAL_ICOM is not set
-CONFIG_SERIAL_JSM=m
-CONFIG_UNIX98_PTYS=y
-# CONFIG_LEGACY_PTYS is not set
-CONFIG_HVC_CONSOLE=y
-CONFIG_HVCS=m
-
-#
-# IPMI
-#
-CONFIG_IPMI_HANDLER=m
-# CONFIG_IPMI_PANIC_EVENT is not set
-CONFIG_IPMI_DEVICE_INTERFACE=m
-CONFIG_IPMI_SI=m
-CONFIG_IPMI_WATCHDOG=m
-CONFIG_IPMI_POWEROFF=m
-
-#
-# Watchdog Cards
-#
-CONFIG_WATCHDOG=y
-# CONFIG_WATCHDOG_NOWAYOUT is not set
-
-#
-# Watchdog Device Drivers
-#
-CONFIG_SOFT_WATCHDOG=m
-
-#
-# PCI-based Watchdog Cards
-#
-CONFIG_PCIPCWATCHDOG=m
-CONFIG_WDTPCI=m
-CONFIG_WDT_501_PCI=y
-
-#
-# USB-based Watchdog Cards
-#
-CONFIG_USBPCWATCHDOG=m
-# CONFIG_RTC is not set
-# CONFIG_GEN_RTC is not set
-CONFIG_DTLK=m
-CONFIG_R3964=m
-CONFIG_APPLICOM=m
-
-#
-# Ftape, the floppy tape device driver
-#
-CONFIG_AGP=m
-CONFIG_AGP_UNINORTH=m
-CONFIG_DRM=m
-CONFIG_DRM_TDFX=m
-CONFIG_DRM_R128=m
-CONFIG_DRM_RADEON=m
-CONFIG_DRM_MGA=m
-CONFIG_DRM_SIS=m
-
-#
-# PCMCIA character devices
-#
-CONFIG_SYNCLINK_CS=m
-# CONFIG_RAW_DRIVER is not set
-CONFIG_HANGCHECK_TIMER=m
-
-#
-# TPM devices
-#
-CONFIG_TCG_TPM=m
-CONFIG_TCG_NSC=m
-CONFIG_TCG_ATMEL=m
-
-#
-# I2C support
-#
-CONFIG_I2C=y
-CONFIG_I2C_CHARDEV=m
-
-#
-# I2C Algorithms
-#
-CONFIG_I2C_ALGOBIT=y
-CONFIG_I2C_ALGOPCF=m
-CONFIG_I2C_ALGOPCA=m
-
-#
-# I2C Hardware Bus support
-#
-# CONFIG_I2C_ALI1535 is not set
-# CONFIG_I2C_ALI1563 is not set
-# CONFIG_I2C_ALI15X3 is not set
-# CONFIG_I2C_AMD756 is not set
-# CONFIG_I2C_AMD8111 is not set
-# CONFIG_I2C_I801 is not set
-# CONFIG_I2C_I810 is not set
-# CONFIG_I2C_PIIX4 is not set
-CONFIG_I2C_ISA=m
-CONFIG_I2C_KEYWEST=y
-# CONFIG_I2C_NFORCE2 is not set
-CONFIG_I2C_PARPORT_LIGHT=m
-CONFIG_I2C_PROSAVAGE=m
-CONFIG_I2C_SAVAGE4=m
-CONFIG_SCx200_ACB=m
-CONFIG_I2C_SIS5595=m
-CONFIG_I2C_SIS630=m
-CONFIG_I2C_SIS96X=m
-# CONFIG_I2C_STUB is not set
-CONFIG_I2C_VIA=m
-CONFIG_I2C_VIAPRO=m
-CONFIG_I2C_VOODOO3=m
-CONFIG_I2C_PCA_ISA=m
-
-#
-# Hardware Sensors Chip support
-#
-CONFIG_I2C_SENSOR=m
-CONFIG_SENSORS_ADM1021=m
-CONFIG_SENSORS_ADM1025=m
-CONFIG_SENSORS_ADM1026=m
-CONFIG_SENSORS_ADM1031=m
-CONFIG_SENSORS_ASB100=m
-CONFIG_SENSORS_DS1621=m
-CONFIG_SENSORS_FSCHER=m
-CONFIG_SENSORS_FSCPOS=m
-CONFIG_SENSORS_GL518SM=m
-CONFIG_SENSORS_GL520SM=m
-CONFIG_SENSORS_IT87=m
-CONFIG_SENSORS_LM63=m
-CONFIG_SENSORS_LM75=m
-CONFIG_SENSORS_LM77=m
-CONFIG_SENSORS_LM78=m
-CONFIG_SENSORS_LM80=m
-CONFIG_SENSORS_LM83=m
-CONFIG_SENSORS_LM85=m
-CONFIG_SENSORS_LM87=m
-CONFIG_SENSORS_LM90=m
-CONFIG_SENSORS_LM92=m
-CONFIG_SENSORS_MAX1619=m
-CONFIG_SENSORS_PC87360=m
-CONFIG_SENSORS_SMSC47B397=m
-CONFIG_SENSORS_SIS5595=m
-CONFIG_SENSORS_SMSC47M1=m
-CONFIG_SENSORS_VIA686A=m
-CONFIG_SENSORS_W83781D=m
-CONFIG_SENSORS_W83L785TS=m
-CONFIG_SENSORS_W83627HF=m
-
-#
-# Other I2C Chip support
-#
-CONFIG_SENSORS_DS1337=m
-CONFIG_SENSORS_EEPROM=m
-CONFIG_SENSORS_PCF8574=m
-CONFIG_SENSORS_PCF8591=m
-CONFIG_SENSORS_RTC8564=m
-# CONFIG_I2C_DEBUG_CORE is not set
-# CONFIG_I2C_DEBUG_ALGO is not set
-# CONFIG_I2C_DEBUG_BUS is not set
-# CONFIG_I2C_DEBUG_CHIP is not set
-
-#
-# Dallas's 1-wire bus
-#
-CONFIG_W1=m
-CONFIG_W1_MATROX=m
-CONFIG_W1_DS9490=m
-CONFIG_W1_DS9490_BRIDGE=m
-CONFIG_W1_THERM=m
-CONFIG_W1_SMEM=m
-
-#
-# Misc devices
-#
-
-#
-# Multimedia devices
-#
-CONFIG_VIDEO_DEV=m
-
-#
-# Video For Linux
-#
-
-#
-# Video Adapters
-#
-CONFIG_VIDEO_BT848=m
-CONFIG_VIDEO_CPIA=m
-CONFIG_VIDEO_CPIA_USB=m
-CONFIG_VIDEO_SAA5246A=m
-CONFIG_VIDEO_SAA5249=m
-CONFIG_TUNER_3036=m
-CONFIG_VIDEO_STRADIS=m
-CONFIG_VIDEO_ZORAN=m
-CONFIG_VIDEO_ZORAN_BUZ=m
-CONFIG_VIDEO_ZORAN_DC10=m
-CONFIG_VIDEO_ZORAN_DC30=m
-CONFIG_VIDEO_ZORAN_LML33=m
-CONFIG_VIDEO_ZORAN_LML33R10=m
-CONFIG_VIDEO_SAA7134=m
-CONFIG_VIDEO_SAA7134_DVB=m
-CONFIG_VIDEO_MXB=m
-CONFIG_VIDEO_DPC=m
-CONFIG_VIDEO_HEXIUM_ORION=m
-CONFIG_VIDEO_HEXIUM_GEMINI=m
-CONFIG_VIDEO_CX88=m
-CONFIG_VIDEO_CX88_DVB=m
-CONFIG_VIDEO_OVCAMCHIP=m
-
-#
-# Radio Adapters
-#
-CONFIG_RADIO_GEMTEK_PCI=m
-CONFIG_RADIO_MAXIRADIO=m
-CONFIG_RADIO_MAESTRO=m
-
-#
-# Digital Video Broadcasting Devices
-#
-CONFIG_DVB=y
-CONFIG_DVB_CORE=m
-
-#
-# Supported SAA7146 based PCI Adapters
-#
-CONFIG_DVB_AV7110=m
-CONFIG_DVB_AV7110_OSD=y
-CONFIG_DVB_BUDGET=m
-CONFIG_DVB_BUDGET_CI=m
-CONFIG_DVB_BUDGET_AV=m
-CONFIG_DVB_BUDGET_PATCH=m
-
-#
-# Supported USB Adapters
-#
-CONFIG_DVB_TTUSB_BUDGET=m
-CONFIG_DVB_TTUSB_DEC=m
-CONFIG_DVB_DIBUSB=m
-CONFIG_DVB_DIBUSB_MISDESIGNED_DEVICES=y
-# CONFIG_DVB_DIBCOM_DEBUG is not set
-CONFIG_DVB_CINERGYT2=m
-# CONFIG_DVB_CINERGYT2_TUNING is not set
-
-#
-# Supported FlexCopII (B2C2) Adapters
-#
-CONFIG_DVB_B2C2_FLEXCOP=m
-CONFIG_DVB_B2C2_FLEXCOP_PCI=m
-CONFIG_DVB_B2C2_FLEXCOP_USB=m
-# CONFIG_DVB_B2C2_FLEXCOP_DEBUG is not set
-CONFIG_DVB_B2C2_SKYSTAR=m
-
-#
-# Supported BT878 Adapters
-#
-CONFIG_DVB_BT8XX=m
-
-#
-# Supported DVB Frontends
-#
-
-#
-# Customise DVB Frontends
-#
-
-#
-# DVB-S (satellite) frontends
-#
-CONFIG_DVB_STV0299=m
-CONFIG_DVB_CX24110=m
-CONFIG_DVB_TDA8083=m
-CONFIG_DVB_TDA80XX=m
-CONFIG_DVB_MT312=m
-CONFIG_DVB_VES1X93=m
-
-#
-# DVB-T (terrestrial) frontends
-#
-CONFIG_DVB_SP8870=m
-CONFIG_DVB_SP887X=m
-CONFIG_DVB_CX22700=m
-CONFIG_DVB_CX22702=m
-CONFIG_DVB_L64781=m
-CONFIG_DVB_TDA1004X=m
-CONFIG_DVB_NXT6000=m
-CONFIG_DVB_MT352=m
-CONFIG_DVB_DIB3000MB=m
-CONFIG_DVB_DIB3000MC=m
-
-#
-# DVB-C (cable) frontends
-#
-CONFIG_DVB_ATMEL_AT76C651=m
-CONFIG_DVB_VES1820=m
-CONFIG_DVB_TDA10021=m
-CONFIG_DVB_STV0297=m
-
-#
-# ATSC (North American/Korean Terresterial DTV) frontends
-#
-CONFIG_DVB_NXT2002=m
-CONFIG_DVB_OR51211=m
-CONFIG_DVB_OR51132=m
-CONFIG_VIDEO_SAA7146=m
-CONFIG_VIDEO_SAA7146_VV=m
-CONFIG_VIDEO_VIDEOBUF=m
-CONFIG_VIDEO_TUNER=m
-CONFIG_VIDEO_BUF=m
-CONFIG_VIDEO_BUF_DVB=m
-CONFIG_VIDEO_BTCX=m
-CONFIG_VIDEO_IR=m
-CONFIG_VIDEO_TVEEPROM=m
-
-#
-# Graphics support
-#
-CONFIG_FB=y
-CONFIG_FB_CFB_FILLRECT=y
-CONFIG_FB_CFB_COPYAREA=y
-CONFIG_FB_CFB_IMAGEBLIT=y
-CONFIG_FB_SOFT_CURSOR=y
-CONFIG_FB_MACMODES=y
-CONFIG_FB_MODE_HELPERS=y
-CONFIG_FB_TILEBLITTING=y
-CONFIG_FB_CIRRUS=m
-# CONFIG_FB_PM2 is not set
-# CONFIG_FB_CYBER2000 is not set
-CONFIG_FB_OF=y
-# CONFIG_FB_CONTROL is not set
-# CONFIG_FB_PLATINUM is not set
-# CONFIG_FB_VALKYRIE is not set
-CONFIG_FB_CT65550=y
-# CONFIG_FB_ASILIANT is not set
-# CONFIG_FB_IMSTT is not set
-# CONFIG_FB_VGA16 is not set
-CONFIG_FB_NVIDIA=y
-CONFIG_FB_RIVA=y
-CONFIG_FB_RIVA_I2C=y
-# CONFIG_FB_RIVA_DEBUG is not set
-CONFIG_FB_MATROX=y
-CONFIG_FB_MATROX_MILLENIUM=y
-CONFIG_FB_MATROX_MYSTIQUE=y
-CONFIG_FB_MATROX_G=y
-CONFIG_FB_MATROX_I2C=m
-CONFIG_FB_MATROX_MAVEN=m
-CONFIG_FB_MATROX_MULTIHEAD=y
-# CONFIG_FB_RADEON_OLD is not set
-CONFIG_FB_RADEON=y
-CONFIG_FB_RADEON_I2C=y
-# CONFIG_FB_RADEON_DEBUG is not set
-# CONFIG_FB_ATY128 is not set
-CONFIG_FB_ATY=y
-CONFIG_FB_ATY_CT=y
-CONFIG_FB_ATY_GENERIC_LCD=y
-# CONFIG_FB_ATY_XL_INIT is not set
-CONFIG_FB_ATY_GX=y
-CONFIG_FB_SAVAGE=m
-CONFIG_FB_SAVAGE_I2C=y
-CONFIG_FB_SAVAGE_ACCEL=y
-CONFIG_FB_SIS=m
-CONFIG_FB_SIS_300=y
-CONFIG_FB_SIS_315=y
-CONFIG_FB_NEOMAGIC=m
-CONFIG_FB_KYRO=m
-CONFIG_FB_3DFX=y
-# CONFIG_FB_3DFX_ACCEL is not set
-CONFIG_FB_VOODOO1=y
-CONFIG_FB_TRIDENT=m
-CONFIG_FB_TRIDENT_ACCEL=y
-CONFIG_FB_S1D13XXX=m
-# CONFIG_FB_VIRTUAL is not set
-
-#
-# Console display driver support
-#
-CONFIG_VGA_CONSOLE=y
-CONFIG_DUMMY_CONSOLE=y
-CONFIG_FRAMEBUFFER_CONSOLE=y
-# CONFIG_FONTS is not set
-CONFIG_FONT_8x8=y
-CONFIG_FONT_8x16=y
-
-#
-# Logo configuration
-#
-CONFIG_LOGO=y
-# CONFIG_LOGO_LINUX_MONO is not set
-CONFIG_LOGO_LINUX_VGA16=y
-# CONFIG_LOGO_LINUX_CLUT224 is not set
-CONFIG_BACKLIGHT_LCD_SUPPORT=y
-CONFIG_BACKLIGHT_CLASS_DEVICE=m
-CONFIG_BACKLIGHT_DEVICE=y
-CONFIG_LCD_CLASS_DEVICE=m
-CONFIG_LCD_DEVICE=y
-
-#
-# Sound
-#
-CONFIG_SOUND=m
-
-#
-# Advanced Linux Sound Architecture
-#
-CONFIG_SND=m
-CONFIG_SND_TIMER=m
-CONFIG_SND_PCM=m
-CONFIG_SND_HWDEP=m
-CONFIG_SND_RAWMIDI=m
-CONFIG_SND_SEQUENCER=m
-# CONFIG_SND_SEQ_DUMMY is not set
-CONFIG_SND_OSSEMUL=y
-CONFIG_SND_MIXER_OSS=m
-CONFIG_SND_PCM_OSS=m
-CONFIG_SND_SEQUENCER_OSS=y
-# CONFIG_SND_VERBOSE_PRINTK is not set
-# CONFIG_SND_DEBUG is not set
-
-#
-# Generic devices
-#
-CONFIG_SND_MPU401_UART=m
-CONFIG_SND_OPL3_LIB=m
-CONFIG_SND_VX_LIB=m
-# CONFIG_SND_DUMMY is not set
-# CONFIG_SND_VIRMIDI is not set
-# CONFIG_SND_MTPAV is not set
-# CONFIG_SND_SERIAL_U16550 is not set
-# CONFIG_SND_MPU401 is not set
-
-#
-# PCI devices
-#
-CONFIG_SND_AC97_CODEC=m
-# CONFIG_SND_ALI5451 is not set
-CONFIG_SND_ATIIXP=m
-CONFIG_SND_ATIIXP_MODEM=m
-CONFIG_SND_AU8810=m
-CONFIG_SND_AU8820=m
-CONFIG_SND_AU8830=m
-CONFIG_SND_AZT3328=m
-CONFIG_SND_BT87X=m
-# CONFIG_SND_BT87X_OVERCLOCK is not set
-CONFIG_SND_CS46XX=m
-CONFIG_SND_CS46XX_NEW_DSP=y
-CONFIG_SND_CS4281=m
-CONFIG_SND_EMU10K1=m
-CONFIG_SND_EMU10K1X=m
-CONFIG_SND_CA0106=m
-CONFIG_SND_KORG1212=m
-CONFIG_SND_MIXART=m
-CONFIG_SND_NM256=m
-CONFIG_SND_RME32=m
-CONFIG_SND_RME96=m
-CONFIG_SND_RME9652=m
-CONFIG_SND_HDSP=m
-CONFIG_SND_TRIDENT=m
-CONFIG_SND_YMFPCI=m
-CONFIG_SND_ALS4000=m
-CONFIG_SND_CMIPCI=m
-CONFIG_SND_ENS1370=m
-CONFIG_SND_ENS1371=m
-CONFIG_SND_ES1938=m
-CONFIG_SND_ES1968=m
-CONFIG_SND_MAESTRO3=m
-CONFIG_SND_FM801=m
-CONFIG_SND_FM801_TEA575X=m
-CONFIG_SND_ICE1712=m
-CONFIG_SND_ICE1724=m
-# CONFIG_SND_INTEL8X0 is not set
-# CONFIG_SND_INTEL8X0M is not set
-CONFIG_SND_SONICVIBES=m
-CONFIG_SND_VIA82XX=m
-CONFIG_SND_VIA82XX_MODEM=m
-CONFIG_SND_VX222=m
-CONFIG_SND_HDA_INTEL=m
-
-#
-# ALSA PowerMac devices
-#
-# CONFIG_SND_POWERMAC is not set
-
-#
-# USB devices
-#
-CONFIG_SND_USB_AUDIO=m
-CONFIG_SND_USB_USX2Y=m
-
-#
-# PCMCIA devices
-#
-
-#
-# Open Sound System
-#
-# CONFIG_SOUND_PRIME is not set
-
-#
-# USB support
-#
-CONFIG_USB_ARCH_HAS_HCD=y
-CONFIG_USB_ARCH_HAS_OHCI=y
-CONFIG_USB=m
-# CONFIG_USB_DEBUG is not set
-
-#
-# Miscellaneous USB options
-#
-CONFIG_USB_DEVICEFS=y
-CONFIG_USB_BANDWIDTH=y
-CONFIG_USB_DYNAMIC_MINORS=y
-# CONFIG_USB_OTG is not set
-
-#
-# USB Host Controller Drivers
-#
-CONFIG_USB_EHCI_HCD=m
-CONFIG_USB_EHCI_SPLIT_ISO=y
-CONFIG_USB_EHCI_ROOT_HUB_TT=y
-CONFIG_USB_OHCI_HCD=m
-# CONFIG_USB_OHCI_BIG_ENDIAN is not set
-CONFIG_USB_OHCI_LITTLE_ENDIAN=y
-CONFIG_USB_UHCI_HCD=m
-CONFIG_USB_SL811_HCD=m
-CONFIG_USB_SL811_CS=m
-
-#
-# USB Device Class drivers
-#
-CONFIG_USB_AUDIO=m
-
-#
-# USB Bluetooth TTY can only be used with disabled Bluetooth subsystem
-#
-CONFIG_USB_MIDI=m
-CONFIG_USB_ACM=m
-CONFIG_USB_PRINTER=m
-
-#
-# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' may also be needed; see USB_STORAGE Help for more information
-#
-CONFIG_USB_STORAGE=m
-# CONFIG_USB_STORAGE_DEBUG is not set
-CONFIG_USB_STORAGE_DATAFAB=y
-CONFIG_USB_STORAGE_FREECOM=y
-CONFIG_USB_STORAGE_ISD200=y
-CONFIG_USB_STORAGE_DPCM=y
-CONFIG_USB_STORAGE_USBAT=y
-CONFIG_USB_STORAGE_SDDR09=y
-CONFIG_USB_STORAGE_SDDR55=y
-CONFIG_USB_STORAGE_JUMPSHOT=y
-
-#
-# USB Input Devices
-#
-CONFIG_USB_HID=m
-CONFIG_USB_HIDINPUT=y
-CONFIG_HID_FF=y
-CONFIG_HID_PID=y
-CONFIG_LOGITECH_FF=y
-CONFIG_THRUSTMASTER_FF=y
-CONFIG_USB_HIDDEV=y
-
-#
-# USB HID Boot Protocol drivers
-#
-# CONFIG_USB_KBD is not set
-# CONFIG_USB_MOUSE is not set
-CONFIG_USB_AIPTEK=m
-CONFIG_USB_WACOM=m
-CONFIG_USB_KBTAB=m
-CONFIG_USB_POWERMATE=m
-CONFIG_USB_MTOUCH=m
-CONFIG_USB_EGALAX=m
-CONFIG_USB_XPAD=m
-CONFIG_USB_ATI_REMOTE=m
-
-#
-# USB Imaging devices
-#
-CONFIG_USB_MDC800=m
-CONFIG_USB_MICROTEK=m
-
-#
-# USB Multimedia devices
-#
-CONFIG_USB_VICAM=m
-CONFIG_USB_DSBR=m
-CONFIG_USB_IBMCAM=m
-CONFIG_USB_KONICAWC=m
-CONFIG_USB_OV511=m
-CONFIG_USB_SE401=m
-CONFIG_USB_SN9C102=m
-CONFIG_USB_STV680=m
-CONFIG_USB_W9968CF=m
-CONFIG_USB_PWC=m
-
-#
-# USB Network Adapters
-#
-CONFIG_USB_CATC=m
-CONFIG_USB_KAWETH=m
-CONFIG_USB_PEGASUS=m
-CONFIG_USB_RTL8150=m
-CONFIG_USB_USBNET=m
-
-#
-# USB Host-to-Host Cables
-#
-CONFIG_USB_ALI_M5632=y
-CONFIG_USB_AN2720=y
-CONFIG_USB_BELKIN=y
-CONFIG_USB_GENESYS=y
-CONFIG_USB_NET1080=y
-CONFIG_USB_PL2301=y
-CONFIG_USB_KC2190=y
-
-#
-# Intelligent USB Devices/Gadgets
-#
-CONFIG_USB_ARMLINUX=y
-CONFIG_USB_EPSON2888=y
-CONFIG_USB_ZAURUS=y
-CONFIG_USB_CDCETHER=y
-
-#
-# USB Network Adapters
-#
-CONFIG_USB_AX8817X=y
-CONFIG_USB_ZD1201=m
-# CONFIG_USB_MON is not set
-
-#
-# USB port drivers
-#
-
-#
-# USB Serial Converter support
-#
-CONFIG_USB_SERIAL=m
-CONFIG_USB_SERIAL_GENERIC=y
-CONFIG_USB_SERIAL_AIRPRIME=m
-CONFIG_USB_SERIAL_BELKIN=m
-CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
-CONFIG_USB_SERIAL_CP2101=m
-CONFIG_USB_SERIAL_CYPRESS_M8=m
-CONFIG_USB_SERIAL_EMPEG=m
-CONFIG_USB_SERIAL_FTDI_SIO=m
-CONFIG_USB_SERIAL_VISOR=m
-CONFIG_USB_SERIAL_IPAQ=m
-CONFIG_USB_SERIAL_IR=m
-CONFIG_USB_SERIAL_EDGEPORT=m
-CONFIG_USB_SERIAL_EDGEPORT_TI=m
-CONFIG_USB_SERIAL_GARMIN=m
-CONFIG_USB_SERIAL_IPW=m
-CONFIG_USB_SERIAL_KLSI=m
-CONFIG_USB_SERIAL_KOBIL_SCT=m
-CONFIG_USB_SERIAL_MCT_U232=m
-CONFIG_USB_SERIAL_PL2303=m
-CONFIG_USB_SERIAL_HP4X=m
-CONFIG_USB_SERIAL_SAFE=m
-CONFIG_USB_SERIAL_SAFE_PADDED=y
-CONFIG_USB_SERIAL_TI=m
-CONFIG_USB_SERIAL_CYBERJACK=m
-CONFIG_USB_SERIAL_XIRCOM=m
-CONFIG_USB_SERIAL_OPTION=m
-CONFIG_USB_SERIAL_OMNINET=m
-CONFIG_USB_EZUSB=y
-
-#
-# USB Miscellaneous drivers
-#
-CONFIG_USB_AUERSWALD=m
-CONFIG_USB_RIO500=m
-CONFIG_USB_LEGOTOWER=m
-CONFIG_USB_LCD=m
-CONFIG_USB_LED=m
-CONFIG_USB_CYTHERM=m
-CONFIG_USB_PHIDGETKIT=m
-CONFIG_USB_PHIDGETSERVO=m
-CONFIG_USB_IDMOUSE=m
-CONFIG_USB_SISUSBVGA=m
-CONFIG_USB_TEST=m
-
-#
-# USB ATM/DSL drivers
-#
-CONFIG_USB_ATM=m
-CONFIG_USB_SPEEDTOUCH=m
-
-#
-# USB Gadget Support
-#
-CONFIG_USB_GADGET=m
-# CONFIG_USB_GADGET_DEBUG_FILES is not set
-CONFIG_USB_GADGET_NET2280=y
-CONFIG_USB_NET2280=m
-# CONFIG_USB_GADGET_PXA2XX is not set
-# CONFIG_USB_GADGET_GOKU is not set
-# CONFIG_USB_GADGET_LH7A40X is not set
-# CONFIG_USB_GADGET_OMAP is not set
-# CONFIG_USB_GADGET_DUMMY_HCD is not set
-CONFIG_USB_GADGET_DUALSPEED=y
-CONFIG_USB_ZERO=m
-CONFIG_USB_ETH=m
-CONFIG_USB_ETH_RNDIS=y
-CONFIG_USB_GADGETFS=m
-CONFIG_USB_FILE_STORAGE=m
-CONFIG_USB_FILE_STORAGE_TEST=y
-CONFIG_USB_G_SERIAL=m
-
-#
-# MMC/SD Card support
-#
-CONFIG_MMC=m
-# CONFIG_MMC_DEBUG is not set
-CONFIG_MMC_BLOCK=m
-CONFIG_MMC_WBSD=m
-
-#
-# InfiniBand support
-#
-CONFIG_INFINIBAND=m
-CONFIG_INFINIBAND_MTHCA=m
-# CONFIG_INFINIBAND_MTHCA_DEBUG is not set
-CONFIG_INFINIBAND_IPOIB=m
-# CONFIG_INFINIBAND_IPOIB_DEBUG is not set
-
-#
-# File systems
-#
-CONFIG_EXT2_FS=m
-CONFIG_EXT2_FS_XATTR=y
-CONFIG_EXT2_FS_POSIX_ACL=y
-CONFIG_EXT2_FS_SECURITY=y
-CONFIG_EXT3_FS=m
-CONFIG_EXT3_FS_XATTR=y
-CONFIG_EXT3_FS_POSIX_ACL=y
-CONFIG_EXT3_FS_SECURITY=y
-CONFIG_JBD=m
-# CONFIG_JBD_DEBUG is not set
-CONFIG_FS_MBCACHE=m
-CONFIG_REISERFS_FS=m
-# CONFIG_REISERFS_CHECK is not set
-# CONFIG_REISERFS_PROC_INFO is not set
-CONFIG_REISERFS_FS_XATTR=y
-CONFIG_REISERFS_FS_POSIX_ACL=y
-CONFIG_REISERFS_FS_SECURITY=y
-CONFIG_JFS_FS=m
-CONFIG_JFS_POSIX_ACL=y
-# CONFIG_JFS_SECURITY is not set
-# CONFIG_JFS_DEBUG is not set
-CONFIG_JFS_STATISTICS=y
-CONFIG_FS_POSIX_ACL=y
-
-#
-# XFS support
-#
-CONFIG_XFS_FS=m
-CONFIG_XFS_EXPORT=y
-# CONFIG_XFS_RT is not set
-CONFIG_XFS_QUOTA=y
-CONFIG_XFS_SECURITY=y
-CONFIG_XFS_POSIX_ACL=y
-CONFIG_MINIX_FS=m
-# CONFIG_ROMFS_FS is not set
-# CONFIG_QUOTA is not set
-CONFIG_QUOTACTL=y
-CONFIG_DNOTIFY=y
-# CONFIG_AUTOFS_FS is not set
-CONFIG_AUTOFS4_FS=m
-
-#
-# CD-ROM/DVD Filesystems
-#
-CONFIG_ISO9660_FS=m
-CONFIG_JOLIET=y
-CONFIG_ZISOFS=y
-CONFIG_ZISOFS_FS=m
-CONFIG_UDF_FS=m
-CONFIG_UDF_NLS=y
-
-#
-# DOS/FAT/NT Filesystems
-#
-CONFIG_FAT_FS=m
-CONFIG_MSDOS_FS=m
-CONFIG_VFAT_FS=m
-CONFIG_FAT_DEFAULT_CODEPAGE=437
-CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
-CONFIG_NTFS_FS=m
-# CONFIG_NTFS_DEBUG is not set
-# CONFIG_NTFS_RW is not set
-
-#
-# Pseudo filesystems
-#
-CONFIG_PROC_FS=y
-CONFIG_PROC_KCORE=y
-CONFIG_SYSFS=y
-CONFIG_DEVFS_FS=y
-# CONFIG_DEVFS_MOUNT is not set
-# CONFIG_DEVFS_DEBUG is not set
-CONFIG_DEVPTS_FS_XATTR=y
-CONFIG_DEVPTS_FS_SECURITY=y
-CONFIG_TMPFS=y
-CONFIG_TMPFS_XATTR=y
-CONFIG_TMPFS_SECURITY=y
-# CONFIG_HUGETLBFS is not set
-# CONFIG_HUGETLB_PAGE is not set
-CONFIG_RAMFS=y
-
-#
-# Miscellaneous filesystems
-#
-CONFIG_ADFS_FS=m
-# CONFIG_ADFS_FS_RW is not set
-CONFIG_AFFS_FS=m
-CONFIG_ASFS_FS=m
-CONFIG_ASFS_DEFAULT_CODEPAGE=""
-CONFIG_ASFS_RW=y
-CONFIG_HFS_FS=m
-CONFIG_HFSPLUS_FS=m
-CONFIG_BEFS_FS=m
-# CONFIG_BEFS_DEBUG is not set
-CONFIG_BFS_FS=m
-CONFIG_EFS_FS=m
-CONFIG_CRAMFS=y
-CONFIG_VXFS_FS=m
-CONFIG_HPFS_FS=m
-CONFIG_QNX4FS_FS=m
-CONFIG_SYSV_FS=m
-CONFIG_UFS_FS=m
-# CONFIG_UFS_FS_WRITE is not set
-
-#
-# Network File Systems
-#
-CONFIG_NFS_FS=m
-CONFIG_NFS_V3=y
-CONFIG_NFS_V4=y
-# CONFIG_NFS_DIRECTIO is not set
-CONFIG_NFSD=m
-CONFIG_NFSD_V3=y
-CONFIG_NFSD_V4=y
-CONFIG_NFSD_TCP=y
-CONFIG_LOCKD=m
-CONFIG_LOCKD_V4=y
-CONFIG_EXPORTFS=m
-CONFIG_SUNRPC=m
-CONFIG_SUNRPC_GSS=m
-CONFIG_RPCSEC_GSS_KRB5=m
-CONFIG_RPCSEC_GSS_SPKM3=m
-CONFIG_SMB_FS=m
-CONFIG_SMB_NLS_DEFAULT=y
-CONFIG_SMB_NLS_REMOTE="iso8859-1"
-CONFIG_CIFS=m
-# CONFIG_CIFS_STATS is not set
-CONFIG_CIFS_XATTR=y
-# CONFIG_CIFS_POSIX is not set
-# CONFIG_CIFS_EXPERIMENTAL is not set
-CONFIG_NCP_FS=m
-# CONFIG_NCPFS_PACKET_SIGNING is not set
-# CONFIG_NCPFS_IOCTL_LOCKING is not set
-# CONFIG_NCPFS_STRONG is not set
-CONFIG_NCPFS_NFS_NS=y
-CONFIG_NCPFS_OS2_NS=y
-# CONFIG_NCPFS_SMALLDOS is not set
-CONFIG_NCPFS_NLS=y
-CONFIG_NCPFS_EXTRAS=y
-CONFIG_CODA_FS=m
-# CONFIG_CODA_FS_OLD_API is not set
-CONFIG_AFS_FS=m
-CONFIG_RXRPC=m
-
-#
-# Partition Types
-#
-CONFIG_PARTITION_ADVANCED=y
-# CONFIG_ACORN_PARTITION is not set
-# CONFIG_OSF_PARTITION is not set
-CONFIG_AMIGA_PARTITION=y
-# CONFIG_ATARI_PARTITION is not set
-CONFIG_MAC_PARTITION=y
-CONFIG_MSDOS_PARTITION=y
-# CONFIG_BSD_DISKLABEL is not set
-# CONFIG_MINIX_SUBPARTITION is not set
-# CONFIG_SOLARIS_X86_PARTITION is not set
-# CONFIG_UNIXWARE_DISKLABEL is not set
-# CONFIG_LDM_PARTITION is not set
-# CONFIG_SGI_PARTITION is not set
-# CONFIG_ULTRIX_PARTITION is not set
-# CONFIG_SUN_PARTITION is not set
-# CONFIG_EFI_PARTITION is not set
-
-#
-# Native Language Support
-#
-CONFIG_NLS=m
-CONFIG_NLS_DEFAULT="iso8859-1"
-CONFIG_NLS_CODEPAGE_437=m
-CONFIG_NLS_CODEPAGE_737=m
-CONFIG_NLS_CODEPAGE_775=m
-CONFIG_NLS_CODEPAGE_850=m
-CONFIG_NLS_CODEPAGE_852=m
-CONFIG_NLS_CODEPAGE_855=m
-CONFIG_NLS_CODEPAGE_857=m
-CONFIG_NLS_CODEPAGE_860=m
-CONFIG_NLS_CODEPAGE_861=m
-CONFIG_NLS_CODEPAGE_862=m
-CONFIG_NLS_CODEPAGE_863=m
-CONFIG_NLS_CODEPAGE_864=m
-CONFIG_NLS_CODEPAGE_865=m
-CONFIG_NLS_CODEPAGE_866=m
-CONFIG_NLS_CODEPAGE_869=m
-CONFIG_NLS_CODEPAGE_936=m
-CONFIG_NLS_CODEPAGE_950=m
-CONFIG_NLS_CODEPAGE_932=m
-CONFIG_NLS_CODEPAGE_949=m
-CONFIG_NLS_CODEPAGE_874=m
-CONFIG_NLS_ISO8859_8=m
-CONFIG_NLS_CODEPAGE_1250=m
-CONFIG_NLS_CODEPAGE_1251=m
-CONFIG_NLS_ASCII=m
-CONFIG_NLS_ISO8859_1=m
-CONFIG_NLS_ISO8859_2=m
-CONFIG_NLS_ISO8859_3=m
-CONFIG_NLS_ISO8859_4=m
-CONFIG_NLS_ISO8859_5=m
-CONFIG_NLS_ISO8859_6=m
-CONFIG_NLS_ISO8859_7=m
-CONFIG_NLS_ISO8859_9=m
-CONFIG_NLS_ISO8859_13=m
-CONFIG_NLS_ISO8859_14=m
-CONFIG_NLS_ISO8859_15=m
-CONFIG_NLS_KOI8_R=m
-CONFIG_NLS_KOI8_U=m
-CONFIG_NLS_UTF8=m
-
-#
-# Profiling support
-#
-CONFIG_PROFILING=y
-CONFIG_OPROFILE=m
-
-#
-# Kernel hacking
-#
-# CONFIG_PRINTK_TIME is not set
-CONFIG_DEBUG_KERNEL=y
-CONFIG_MAGIC_SYSRQ=y
-CONFIG_LOG_BUF_SHIFT=14
-# CONFIG_SCHEDSTATS is not set
-# CONFIG_DEBUG_SLAB is not set
-# CONFIG_DEBUG_SPINLOCK is not set
-# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
-# CONFIG_DEBUG_KOBJECT is not set
-# CONFIG_DEBUG_INFO is not set
-# CONFIG_DEBUG_FS is not set
-# CONFIG_DEBUG_STACKOVERFLOW is not set
-# CONFIG_KPROBES is not set
-# CONFIG_DEBUG_STACK_USAGE is not set
-# CONFIG_DEBUGGER is not set
-# CONFIG_PPCDBG is not set
-# CONFIG_IRQSTACKS is not set
-
-#
-# Security options
-#
-CONFIG_KEYS=y
-# CONFIG_KEYS_DEBUG_PROC_KEYS is not set
-CONFIG_SECURITY=y
-CONFIG_SECURITY_NETWORK=y
-CONFIG_SECURITY_CAPABILITIES=y
-# CONFIG_SECURITY_ROOTPLUG is not set
-CONFIG_SECURITY_SECLVL=m
-CONFIG_SECURITY_SELINUX=y
-CONFIG_SECURITY_SELINUX_BOOTPARAM=y
-CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=0
-CONFIG_SECURITY_SELINUX_DISABLE=y
-CONFIG_SECURITY_SELINUX_DEVELOP=y
-CONFIG_SECURITY_SELINUX_AVC_STATS=y
-CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1
-CONFIG_KEYS_COMPAT=y
-
-#
-# Cryptographic options
-#
-CONFIG_CRYPTO=y
-CONFIG_CRYPTO_HMAC=y
-CONFIG_CRYPTO_NULL=m
-CONFIG_CRYPTO_MD4=m
-CONFIG_CRYPTO_MD5=y
-CONFIG_CRYPTO_SHA1=m
-CONFIG_CRYPTO_SHA256=m
-CONFIG_CRYPTO_SHA512=m
-CONFIG_CRYPTO_WP512=m
-CONFIG_CRYPTO_TGR192=m
-CONFIG_CRYPTO_DES=m
-CONFIG_CRYPTO_BLOWFISH=m
-CONFIG_CRYPTO_TWOFISH=m
-CONFIG_CRYPTO_SERPENT=m
-CONFIG_CRYPTO_AES=m
-CONFIG_CRYPTO_CAST5=m
-CONFIG_CRYPTO_CAST6=m
-CONFIG_CRYPTO_TEA=m
-CONFIG_CRYPTO_ARC4=m
-CONFIG_CRYPTO_KHAZAD=m
-CONFIG_CRYPTO_ANUBIS=m
-CONFIG_CRYPTO_DEFLATE=m
-CONFIG_CRYPTO_MICHAEL_MIC=m
-CONFIG_CRYPTO_CRC32C=m
-CONFIG_CRYPTO_TEST=m
-
-#
-# Hardware crypto devices
-#
-
-#
-# Library routines
-#
-CONFIG_CRC_CCITT=m
-CONFIG_CRC32=y
-CONFIG_LIBCRC32C=m
-CONFIG_ZLIB_INFLATE=y
-CONFIG_ZLIB_DEFLATE=m
Modified: people/waldi/kernel/source/linux-2.6/debian/arch/sparc/config
===================================================================
--- people/waldi/kernel/source/linux-2.6/debian/arch/sparc/config 2005-08-14 13:26:38 UTC (rev 3856)
+++ people/waldi/kernel/source/linux-2.6/debian/arch/sparc/config 2005-08-14 14:38:50 UTC (rev 3857)
@@ -110,7 +110,6 @@
CONFIG_PACKET=y
CONFIG_PACKET_MMAP=y
CONFIG_UNIX=y
-# CONFIG_IP_ADVANCED_ROUTER is not set
CONFIG_IP_PNP=y
# CONFIG_IP_PNP_DHCP is not set
# CONFIG_IP_PNP_BOOTP is not set
@@ -530,3 +529,8 @@
# CONFIG_CRYPTO_TEST is not set
CONFIG_CRC_CCITT=m
CONFIG_CRC32=y
+CONFIG_IP_ROUTE_VERBOSE=y
+CONFIG_IP_MULTIPLE_TABLES=y
+CONFIG_IP_ROUTE_FWMARK=y
+CONFIG_IP_ROUTE_MULTIPATH=y
+CONFIG_IP_ADVANCED_ROUTER=y
Modified: people/waldi/kernel/source/linux-2.6/debian/changelog
===================================================================
--- people/waldi/kernel/source/linux-2.6/debian/changelog 2005-08-14 13:26:38 UTC (rev 3856)
+++ people/waldi/kernel/source/linux-2.6/debian/changelog 2005-08-14 14:38:50 UTC (rev 3857)
@@ -1,23 +1,45 @@
linux-2.6 (2.6.12-3) UNRELEASED; urgency=low
- [ Simon Horman ]
+ [ Bastian Blank ]
* Added reference to old kernel-* package names to make
- transition a little more obvious to end uers.
- A Dan Jacobson special Closes: #321167
+ transition a little more obvious to end users.
+ A Dan Jacobson special. Closes: #321167
+
* By the time this makes it into the archive, it will
- be handling kernel-image-2.6-*
+ be handling kernel-image-2.6-* packages.
Closes: #321867
- * By the time this makes it to the arvhive, CONFIG_IA64_PALINF
- will be enabled.
- Closes: #321885
* Link palinfo statically on ia64. (dann frazier) (Closes: #321885)
- -- Simon Horman <horms at debian.org> Tue, 9 Aug 2005 11:00:51 +0900
+ * [hppa] :
+ - Add hppa arch specific patch.
+ - Build-Depend on binutils-hppa64 and gcc-4.0-hppa64.
+ (Kyle McMartin)
+ * Fix permissions in source tarball. (Bastian Blank) (Closes: #322409)
+
+ * Enable the CONFIG_IP_ADVANCED_ROUTER and related options on
+ sparc64 to sync with other architectures. (Jurij Smakov)
+ Closes: #321236
+
+ * Include all executables as well as *.sh and *.pl files found in
+ scripts directory in the headers package. (Bastian Blank)
+ Closes: #322612
+
+ * Include m68k headers into the arch-common headers package on
+ powerpc and make sure that all the directories are linked to
+ properly from the flavour-specific headers packages. (Jurij Smakov)
+ Closes: #322610
+
+ * [powerpc] Enabled the powerpc64 flavour, now that we have a real biarch
+ toolchain in sid. Many thanks go to GOTO Masanori and Matthias Klose as
+ well as any other who worked on the biarch toolchain to make this happen.
+
+ -- Sven Luther <luther at debian.org> Sun, 14 Aug 2005 15:21:37 +0200
+
linux-2.6 (2.6.12-2) unstable; urgency=low
- * The Kernel Team offers its condolences to the family of Jens Schmalzig
+ * The Kernel Team offers its condolences to the family of Jens Schmalzing
(jensen at debian), who died Saturday, July 30, 2005 in a tragic accident in
Munich. Jens was a member of the Kernel Team, and was instrumental in
taking the powerpc kernel package to 2.6, as well as maintaining MOL
Modified: people/waldi/kernel/source/linux-2.6/debian/patches-arch/hppa.diff
===================================================================
--- people/waldi/kernel/source/linux-2.6/debian/patches-arch/hppa.diff 2005-08-14 13:26:38 UTC (rev 3856)
+++ people/waldi/kernel/source/linux-2.6/debian/patches-arch/hppa.diff 2005-08-14 14:38:50 UTC (rev 3857)
@@ -1,6 +1,7 @@
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/CREDITS CVS2_6_12_PA2/CREDITS
---- LINUS_2_6_12/CREDITS 2005-06-17 21:21:44.000000000 -0600
-+++ CVS2_6_12_PA2/CREDITS 2005-06-17 21:32:28.000000000 -0600
+Index: linux-2.6-2.6.12/CREDITS
+===================================================================
+--- linux-2.6-2.6.12.orig/CREDITS 2005-08-09 09:52:27.000000000 -0400
++++ linux-2.6-2.6.12/CREDITS 2005-08-09 17:53:35.000000000 -0400
@@ -611,8 +611,7 @@
N: Randolph Chung
E: tausq at debian.org
@@ -11,9 +12,10 @@
N: Juan Jose Ciarlante
W: http://juanjox.kernelnotes.org/
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/Documentation/parisc/todo CVS2_6_12_PA2/Documentation/parisc/todo
---- LINUS_2_6_12/Documentation/parisc/todo 1969-12-31 17:00:00.000000000 -0700
-+++ CVS2_6_12_PA2/Documentation/parisc/todo 2005-04-27 00:45:20.000000000 -0600
+Index: linux-2.6-2.6.12/Documentation/parisc/todo
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ linux-2.6-2.6.12/Documentation/parisc/todo 2005-08-09 17:53:35.000000000 -0400
@@ -0,0 +1,82 @@
+Status 2005-03-07 :
+-------------------
@@ -97,9 +99,10 @@
+ - fix HIL problem: ksoftirqd/0 eats 56% cpu (kernel 2.4 & kernel 2.6)
+ - NPTL kernel support (CLONE_*TID flags need to be correctly handled by
+ sys_clone() and friends)
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/MAINTAINERS CVS2_6_12_PA2/MAINTAINERS
---- LINUS_2_6_12/MAINTAINERS 2005-06-17 21:21:44.000000000 -0600
-+++ CVS2_6_12_PA2/MAINTAINERS 2005-06-17 21:32:28.000000000 -0600
+Index: linux-2.6-2.6.12/MAINTAINERS
+===================================================================
+--- linux-2.6-2.6.12.orig/MAINTAINERS 2005-08-09 09:52:27.000000000 -0400
++++ linux-2.6-2.6.12/MAINTAINERS 2005-08-09 17:53:35.000000000 -0400
@@ -191,6 +191,13 @@
W: http://linux.thorsten-knabe.de
S: Maintained
@@ -114,9 +117,10 @@
ADM1025 HARDWARE MONITOR DRIVER
P: Jean Delvare
M: khali at linux-fr.org
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/arch/ia64/ia32/ia32_signal.c CVS2_6_12_PA2/arch/ia64/ia32/ia32_signal.c
---- LINUS_2_6_12/arch/ia64/ia32/ia32_signal.c 2005-06-17 21:21:49.000000000 -0600
-+++ CVS2_6_12_PA2/arch/ia64/ia32/ia32_signal.c 2005-05-08 19:59:59.000000000 -0600
+Index: linux-2.6-2.6.12/arch/ia64/ia32/ia32_signal.c
+===================================================================
+--- linux-2.6-2.6.12.orig/arch/ia64/ia32/ia32_signal.c 2005-08-09 09:52:27.000000000 -0400
++++ linux-2.6-2.6.12/arch/ia64/ia32/ia32_signal.c 2005-08-09 17:53:35.000000000 -0400
@@ -24,6 +24,7 @@
#include <linux/unistd.h>
#include <linux/wait.h>
@@ -125,9 +129,10 @@
#include <asm/intrinsics.h>
#include <asm/uaccess.h>
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/arch/ia64/ia32/ia32priv.h CVS2_6_12_PA2/arch/ia64/ia32/ia32priv.h
---- LINUS_2_6_12/arch/ia64/ia32/ia32priv.h 2005-06-17 21:21:49.000000000 -0600
-+++ CVS2_6_12_PA2/arch/ia64/ia32/ia32priv.h 2005-04-12 14:38:26.000000000 -0600
+Index: linux-2.6-2.6.12/arch/ia64/ia32/ia32priv.h
+===================================================================
+--- linux-2.6-2.6.12.orig/arch/ia64/ia32/ia32priv.h 2005-08-09 09:52:27.000000000 -0400
++++ linux-2.6-2.6.12/arch/ia64/ia32/ia32priv.h 2005-08-09 17:53:35.000000000 -0400
@@ -225,58 +225,6 @@
unsigned int st_ino_hi;
};
@@ -187,9 +192,10 @@
struct old_linux32_dirent {
u32 d_ino;
u32 d_offset;
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/arch/parisc/Kconfig CVS2_6_12_PA2/arch/parisc/Kconfig
---- LINUS_2_6_12/arch/parisc/Kconfig 2005-06-17 21:21:52.000000000 -0600
-+++ CVS2_6_12_PA2/arch/parisc/Kconfig 2005-05-08 20:00:05.000000000 -0600
+Index: linux-2.6-2.6.12/arch/parisc/Kconfig
+===================================================================
+--- linux-2.6-2.6.12.orig/arch/parisc/Kconfig 2005-08-09 09:52:27.000000000 -0400
++++ linux-2.6-2.6.12/arch/parisc/Kconfig 2005-08-09 17:53:35.000000000 -0400
@@ -150,7 +150,7 @@
config DISCONTIGMEM
@@ -199,9 +205,26 @@
help
Say Y to support efficient handling of discontiguous physical memory,
for architectures which are either NUMA (Non-Uniform Memory Access)
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/arch/parisc/Makefile CVS2_6_12_PA2/arch/parisc/Makefile
---- LINUS_2_6_12/arch/parisc/Makefile 2005-06-17 21:21:52.000000000 -0600
-+++ CVS2_6_12_PA2/arch/parisc/Makefile 2005-04-05 08:15:46.000000000 -0600
+Index: linux-2.6-2.6.12/arch/parisc/Makefile
+===================================================================
+--- linux-2.6-2.6.12.orig/arch/parisc/Makefile 2005-08-09 09:52:27.000000000 -0400
++++ linux-2.6-2.6.12/arch/parisc/Makefile 2005-08-09 17:53:47.000000000 -0400
+@@ -20,13 +20,13 @@
+ CHECKFLAGS += -D__hppa__=1
+
+ ifdef CONFIG_64BIT
+-CROSS_COMPILE := hppa64-linux-
++CROSS_COMPILE := hppa64-linux-gnu-
+ UTS_MACHINE := parisc64
+ CHECKFLAGS += -D__LP64__=1 -m64
+ else
+ MACHINE := $(subst 64,,$(shell uname -m))
+ ifneq ($(MACHINE),parisc)
+-CROSS_COMPILE := hppa-linux-
++CROSS_COMPILE := hppa-linux-gnu-
+ endif
+ endif
+
@@ -34,6 +34,11 @@
OBJCOPY_FLAGS =-O binary -R .note -R .comment -S
@@ -214,9 +237,19 @@
cflags-y := -pipe
# These flags should be implied by an hppa-linux configuration, but they
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/arch/parisc/configs/712_defconfig CVS2_6_12_PA2/arch/parisc/configs/712_defconfig
---- LINUS_2_6_12/arch/parisc/configs/712_defconfig 2005-06-17 21:21:52.000000000 -0600
-+++ CVS2_6_12_PA2/arch/parisc/configs/712_defconfig 2005-06-03 13:06:36.000000000 -0600
+@@ -43,7 +48,7 @@
+ # Currently we save and restore fpregs on all kernel entry/interruption paths.
+ # If that gets optimized, we might need to disable the use of fpregs in the
+ # kernel.
+-#cflags-y += -mdisable-fpregs
++cflags-y += -mdisable-fpregs
+
+ # Without this, "ld -r" results in .text sections that are too big
+ # (> 0x40000) for branches to reach stubs.
+Index: linux-2.6-2.6.12/arch/parisc/configs/712_defconfig
+===================================================================
+--- linux-2.6-2.6.12.orig/arch/parisc/configs/712_defconfig 2005-08-09 09:52:27.000000000 -0400
++++ linux-2.6-2.6.12/arch/parisc/configs/712_defconfig 2005-08-09 17:53:35.000000000 -0400
@@ -1,12 +1,16 @@
#
# Automatically generated make config: don't edit
@@ -566,9 +599,10 @@
# Library routines
#
CONFIG_CRC_CCITT=m
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/arch/parisc/configs/a500_defconfig CVS2_6_12_PA2/arch/parisc/configs/a500_defconfig
---- LINUS_2_6_12/arch/parisc/configs/a500_defconfig 2005-06-17 21:21:52.000000000 -0600
-+++ CVS2_6_12_PA2/arch/parisc/configs/a500_defconfig 2005-06-03 13:06:36.000000000 -0600
+Index: linux-2.6-2.6.12/arch/parisc/configs/a500_defconfig
+===================================================================
+--- linux-2.6-2.6.12.orig/arch/parisc/configs/a500_defconfig 2005-08-09 09:52:27.000000000 -0400
++++ linux-2.6-2.6.12/arch/parisc/configs/a500_defconfig 2005-08-09 17:53:35.000000000 -0400
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
@@ -760,9 +794,10 @@
CONFIG_CRYPTO_DES=m
CONFIG_CRYPTO_BLOWFISH=m
CONFIG_CRYPTO_TWOFISH=m
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/arch/parisc/configs/b180_defconfig CVS2_6_12_PA2/arch/parisc/configs/b180_defconfig
---- LINUS_2_6_12/arch/parisc/configs/b180_defconfig 2005-06-17 21:21:52.000000000 -0600
-+++ CVS2_6_12_PA2/arch/parisc/configs/b180_defconfig 2005-06-03 13:06:36.000000000 -0600
+Index: linux-2.6-2.6.12/arch/parisc/configs/b180_defconfig
+===================================================================
+--- linux-2.6-2.6.12.orig/arch/parisc/configs/b180_defconfig 2005-08-09 09:52:27.000000000 -0400
++++ linux-2.6-2.6.12/arch/parisc/configs/b180_defconfig 2005-08-09 17:53:35.000000000 -0400
@@ -1,12 +1,16 @@
#
# Automatically generated make config: don't edit
@@ -1178,9 +1213,10 @@
# Library routines
#
# CONFIG_CRC_CCITT is not set
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/arch/parisc/configs/c3000_defconfig CVS2_6_12_PA2/arch/parisc/configs/c3000_defconfig
---- LINUS_2_6_12/arch/parisc/configs/c3000_defconfig 2005-06-17 21:21:52.000000000 -0600
-+++ CVS2_6_12_PA2/arch/parisc/configs/c3000_defconfig 2005-06-03 13:06:36.000000000 -0600
+Index: linux-2.6-2.6.12/arch/parisc/configs/c3000_defconfig
+===================================================================
+--- linux-2.6-2.6.12.orig/arch/parisc/configs/c3000_defconfig 2005-08-09 09:52:27.000000000 -0400
++++ linux-2.6-2.6.12/arch/parisc/configs/c3000_defconfig 2005-08-09 17:53:35.000000000 -0400
@@ -1,12 +1,16 @@
#
# Automatically generated make config: don't edit
@@ -1613,9 +1649,10 @@
# Library routines
#
CONFIG_CRC_CCITT=m
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/arch/parisc/kernel/entry.S CVS2_6_12_PA2/arch/parisc/kernel/entry.S
---- LINUS_2_6_12/arch/parisc/kernel/entry.S 2005-06-17 21:21:52.000000000 -0600
-+++ CVS2_6_12_PA2/arch/parisc/kernel/entry.S 2005-05-12 23:25:09.000000000 -0600
+Index: linux-2.6-2.6.12/arch/parisc/kernel/entry.S
+===================================================================
+--- linux-2.6-2.6.12.orig/arch/parisc/kernel/entry.S 2005-08-09 09:52:27.000000000 -0400
++++ linux-2.6-2.6.12/arch/parisc/kernel/entry.S 2005-08-09 17:53:35.000000000 -0400
@@ -30,14 +30,14 @@
* - save registers to kernel stack and handle in assembly or C */
@@ -2196,9 +2233,10 @@
ldo -16(%r30),%r29 /* Reference param save area */
#endif
BL do_signal,%r2
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/arch/parisc/kernel/head.S CVS2_6_12_PA2/arch/parisc/kernel/head.S
---- LINUS_2_6_12/arch/parisc/kernel/head.S 2005-06-17 21:21:52.000000000 -0600
-+++ CVS2_6_12_PA2/arch/parisc/kernel/head.S 2005-05-12 23:25:09.000000000 -0600
+Index: linux-2.6-2.6.12/arch/parisc/kernel/head.S
+===================================================================
+--- linux-2.6-2.6.12.orig/arch/parisc/kernel/head.S 2005-08-09 09:52:27.000000000 -0400
++++ linux-2.6-2.6.12/arch/parisc/kernel/head.S 2005-08-09 17:53:35.000000000 -0400
@@ -12,7 +12,7 @@
* Initial Version 04-23-1999 by Helge Deller <deller at gmx.de>
*/
@@ -2380,9 +2418,10 @@
.word 0
-#endif /*!LP64*/
+#endif /*!CONFIG_64BIT*/
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/arch/parisc/kernel/ioctl32.c CVS2_6_12_PA2/arch/parisc/kernel/ioctl32.c
---- LINUS_2_6_12/arch/parisc/kernel/ioctl32.c 2005-06-17 21:21:52.000000000 -0600
-+++ CVS2_6_12_PA2/arch/parisc/kernel/ioctl32.c 2005-04-12 13:17:10.000000000 -0600
+Index: linux-2.6-2.6.12/arch/parisc/kernel/ioctl32.c
+===================================================================
+--- linux-2.6-2.6.12.orig/arch/parisc/kernel/ioctl32.c 2005-08-09 09:52:27.000000000 -0400
++++ linux-2.6-2.6.12/arch/parisc/kernel/ioctl32.c 2005-08-09 17:53:35.000000000 -0400
@@ -104,12 +104,9 @@
}
@@ -2457,9 +2496,10 @@
return ret;
}
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/arch/parisc/kernel/pacache.S CVS2_6_12_PA2/arch/parisc/kernel/pacache.S
---- LINUS_2_6_12/arch/parisc/kernel/pacache.S 2005-06-17 21:21:52.000000000 -0600
-+++ CVS2_6_12_PA2/arch/parisc/kernel/pacache.S 2005-05-12 23:25:09.000000000 -0600
+Index: linux-2.6-2.6.12/arch/parisc/kernel/pacache.S
+===================================================================
+--- linux-2.6-2.6.12.orig/arch/parisc/kernel/pacache.S 2005-08-09 09:52:27.000000000 -0400
++++ linux-2.6-2.6.12/arch/parisc/kernel/pacache.S 2005-08-09 17:53:35.000000000 -0400
@@ -26,7 +26,7 @@
* can be used.
*/
@@ -2838,9 +2878,10 @@
rfi
nop
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/arch/parisc/kernel/pci-dma.c CVS2_6_12_PA2/arch/parisc/kernel/pci-dma.c
---- LINUS_2_6_12/arch/parisc/kernel/pci-dma.c 2005-06-17 21:21:52.000000000 -0600
-+++ CVS2_6_12_PA2/arch/parisc/kernel/pci-dma.c 2005-06-04 13:09:08.000000000 -0600
+Index: linux-2.6-2.6.12/arch/parisc/kernel/pci-dma.c
+===================================================================
+--- linux-2.6-2.6.12.orig/arch/parisc/kernel/pci-dma.c 2005-08-09 09:52:27.000000000 -0400
++++ linux-2.6-2.6.12/arch/parisc/kernel/pci-dma.c 2005-08-09 17:53:35.000000000 -0400
@@ -31,7 +31,7 @@
#include <asm/page.h> /* get_order */
#include <asm/pgalloc.h>
@@ -2850,9 +2891,10 @@
static struct proc_dir_entry * proc_gsc_root = NULL;
static int pcxl_proc_info(char *buffer, char **start, off_t offset, int length);
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/arch/parisc/kernel/pci.c CVS2_6_12_PA2/arch/parisc/kernel/pci.c
---- LINUS_2_6_12/arch/parisc/kernel/pci.c 2005-06-17 21:21:52.000000000 -0600
-+++ CVS2_6_12_PA2/arch/parisc/kernel/pci.c 2004-11-02 17:57:49.000000000 -0700
+Index: linux-2.6-2.6.12/arch/parisc/kernel/pci.c
+===================================================================
+--- linux-2.6-2.6.12.orig/arch/parisc/kernel/pci.c 2005-08-09 09:52:27.000000000 -0400
++++ linux-2.6-2.6.12/arch/parisc/kernel/pci.c 2005-08-09 17:53:35.000000000 -0400
@@ -202,7 +202,8 @@
pcibios_link_hba_resources( struct resource *hba_res, struct resource *r)
{
@@ -2863,9 +2905,10 @@
r->parent = hba_res;
/* reverse link is harder *sigh* */
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/arch/parisc/kernel/pdc_cons.c CVS2_6_12_PA2/arch/parisc/kernel/pdc_cons.c
---- LINUS_2_6_12/arch/parisc/kernel/pdc_cons.c 2005-06-17 21:21:52.000000000 -0600
-+++ CVS2_6_12_PA2/arch/parisc/kernel/pdc_cons.c 2005-03-15 07:02:43.000000000 -0700
+Index: linux-2.6-2.6.12/arch/parisc/kernel/pdc_cons.c
+===================================================================
+--- linux-2.6-2.6.12.orig/arch/parisc/kernel/pdc_cons.c 2005-08-09 09:52:27.000000000 -0400
++++ linux-2.6-2.6.12/arch/parisc/kernel/pdc_cons.c 2005-08-09 17:53:35.000000000 -0400
@@ -41,7 +41,7 @@
/* Define EARLY_BOOTUP_DEBUG to debug kernel related boot problems.
@@ -2972,9 +3015,10 @@
pdc_console_init_force();
}
-
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/arch/parisc/kernel/perf.c CVS2_6_12_PA2/arch/parisc/kernel/perf.c
---- LINUS_2_6_12/arch/parisc/kernel/perf.c 2005-06-17 21:21:52.000000000 -0600
-+++ CVS2_6_12_PA2/arch/parisc/kernel/perf.c 2005-03-18 10:31:41.000000000 -0700
+Index: linux-2.6-2.6.12/arch/parisc/kernel/perf.c
+===================================================================
+--- linux-2.6-2.6.12.orig/arch/parisc/kernel/perf.c 2005-08-09 09:52:27.000000000 -0400
++++ linux-2.6-2.6.12/arch/parisc/kernel/perf.c 2005-08-09 17:53:35.000000000 -0400
@@ -746,7 +746,8 @@
uint64_t *bptr;
uint32_t dwords;
@@ -3006,9 +3050,10 @@
}
return 0;
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/arch/parisc/kernel/process.c CVS2_6_12_PA2/arch/parisc/kernel/process.c
---- LINUS_2_6_12/arch/parisc/kernel/process.c 2005-06-17 21:21:52.000000000 -0600
-+++ CVS2_6_12_PA2/arch/parisc/kernel/process.c 2005-05-21 19:10:45.000000000 -0600
+Index: linux-2.6-2.6.12/arch/parisc/kernel/process.c
+===================================================================
+--- linux-2.6-2.6.12.orig/arch/parisc/kernel/process.c 2005-08-09 09:52:27.000000000 -0400
++++ linux-2.6-2.6.12/arch/parisc/kernel/process.c 2005-08-09 17:53:35.000000000 -0400
@@ -9,7 +9,7 @@
* Copyright (C) 2000-2003 Paul Bame <bame at parisc-linux.org>
* Copyright (C) 2000 Philipp Rumpf <prumpf with tux.org>
@@ -3018,9 +3063,10 @@
* Copyright (C) 2000 Grant Grundler <grundler with parisc-linux.org>
* Copyright (C) 2001 Alan Modra <amodra at parisc-linux.org>
* Copyright (C) 2001-2002 Ryan Bradetich <rbrad at parisc-linux.org>
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/arch/parisc/kernel/real2.S CVS2_6_12_PA2/arch/parisc/kernel/real2.S
---- LINUS_2_6_12/arch/parisc/kernel/real2.S 2005-06-17 21:21:52.000000000 -0600
-+++ CVS2_6_12_PA2/arch/parisc/kernel/real2.S 2005-05-12 23:25:09.000000000 -0600
+Index: linux-2.6-2.6.12/arch/parisc/kernel/real2.S
+===================================================================
+--- linux-2.6-2.6.12.orig/arch/parisc/kernel/real2.S 2005-08-09 09:52:27.000000000 -0400
++++ linux-2.6-2.6.12/arch/parisc/kernel/real2.S 2005-08-09 17:53:35.000000000 -0400
@@ -7,8 +7,10 @@
* Copyright (C) 2000 Hewlett Packard (Paul Bame bame at puffin.external.hp.com)
*
@@ -3146,9 +3192,10 @@
bve (%r2)
#else
bv %r0(%r2)
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/arch/parisc/kernel/signal.c CVS2_6_12_PA2/arch/parisc/kernel/signal.c
---- LINUS_2_6_12/arch/parisc/kernel/signal.c 2005-06-17 21:21:52.000000000 -0600
-+++ CVS2_6_12_PA2/arch/parisc/kernel/signal.c 2005-06-05 21:10:06.000000000 -0600
+Index: linux-2.6-2.6.12/arch/parisc/kernel/signal.c
+===================================================================
+--- linux-2.6-2.6.12.orig/arch/parisc/kernel/signal.c 2005-08-09 09:52:27.000000000 -0400
++++ linux-2.6-2.6.12/arch/parisc/kernel/signal.c 2005-08-09 17:53:35.000000000 -0400
@@ -637,6 +637,7 @@
/* Stack is 64-byte aligned, and we only
* need to flush 1 cache line */
@@ -3157,9 +3204,10 @@
"fic 0(%%sr3, %0)\n"
"sync\n"
: : "r"(regs->gr[30]));
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/arch/parisc/kernel/smp.c CVS2_6_12_PA2/arch/parisc/kernel/smp.c
---- LINUS_2_6_12/arch/parisc/kernel/smp.c 2005-06-17 21:21:52.000000000 -0600
-+++ CVS2_6_12_PA2/arch/parisc/kernel/smp.c 2005-05-12 23:25:09.000000000 -0600
+Index: linux-2.6-2.6.12/arch/parisc/kernel/smp.c
+===================================================================
+--- linux-2.6-2.6.12.orig/arch/parisc/kernel/smp.c 2005-08-09 09:52:27.000000000 -0400
++++ linux-2.6-2.6.12/arch/parisc/kernel/smp.c 2005-08-09 17:53:35.000000000 -0400
@@ -18,7 +18,7 @@
*/
#undef ENTRY_SYS_CPUS /* syscall support for iCOD-like functionality */
@@ -3169,9 +3217,10 @@
#include <linux/types.h>
#include <linux/spinlock.h>
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/arch/parisc/kernel/syscall.S CVS2_6_12_PA2/arch/parisc/kernel/syscall.S
---- LINUS_2_6_12/arch/parisc/kernel/syscall.S 2005-06-17 21:21:52.000000000 -0600
-+++ CVS2_6_12_PA2/arch/parisc/kernel/syscall.S 2005-05-12 23:25:09.000000000 -0600
+Index: linux-2.6-2.6.12/arch/parisc/kernel/syscall.S
+===================================================================
+--- linux-2.6-2.6.12.orig/arch/parisc/kernel/syscall.S 2005-08-09 09:52:27.000000000 -0400
++++ linux-2.6-2.6.12/arch/parisc/kernel/syscall.S 2005-08-09 17:53:35.000000000 -0400
@@ -4,8 +4,9 @@
* System call entry code Copyright (c) Matthew Wilcox 1999 <willy at bofh.ai>
* Licensed under the GNU GPL.
@@ -3344,9 +3393,10 @@
.align 4096
.export sys_call_table64
.Lsys_call_table64:
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/arch/parisc/kernel/syscall_table.S CVS2_6_12_PA2/arch/parisc/kernel/syscall_table.S
---- LINUS_2_6_12/arch/parisc/kernel/syscall_table.S 2005-06-17 21:21:52.000000000 -0600
-+++ CVS2_6_12_PA2/arch/parisc/kernel/syscall_table.S 2005-05-14 22:38:00.000000000 -0600
+Index: linux-2.6-2.6.12/arch/parisc/kernel/syscall_table.S
+===================================================================
+--- linux-2.6-2.6.12.orig/arch/parisc/kernel/syscall_table.S 2005-08-09 09:52:27.000000000 -0400
++++ linux-2.6-2.6.12/arch/parisc/kernel/syscall_table.S 2005-08-09 17:53:35.000000000 -0400
@@ -35,7 +35,7 @@
#undef ENTRY_UHOH
#undef ENTRY_COMP
@@ -3375,9 +3425,10 @@
+ ENTRY_SAME(keyctl)
/* Nothing yet */
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/arch/parisc/kernel/time.c CVS2_6_12_PA2/arch/parisc/kernel/time.c
---- LINUS_2_6_12/arch/parisc/kernel/time.c 2005-06-17 21:21:52.000000000 -0600
-+++ CVS2_6_12_PA2/arch/parisc/kernel/time.c 2005-04-09 00:23:13.000000000 -0600
+Index: linux-2.6-2.6.12/arch/parisc/kernel/time.c
+===================================================================
+--- linux-2.6-2.6.12.orig/arch/parisc/kernel/time.c 2005-08-09 09:52:27.000000000 -0400
++++ linux-2.6-2.6.12/arch/parisc/kernel/time.c 2005-08-09 17:53:35.000000000 -0400
@@ -89,14 +89,6 @@
}
}
@@ -3418,9 +3469,10 @@
/*** converted from ia64 ***/
/*
* Return the number of micro-seconds that elapsed since the last
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/arch/parisc/kernel/unaligned.c CVS2_6_12_PA2/arch/parisc/kernel/unaligned.c
---- LINUS_2_6_12/arch/parisc/kernel/unaligned.c 2005-06-17 21:21:52.000000000 -0600
-+++ CVS2_6_12_PA2/arch/parisc/kernel/unaligned.c 2005-05-19 18:05:12.000000000 -0600
+Index: linux-2.6-2.6.12/arch/parisc/kernel/unaligned.c
+===================================================================
+--- linux-2.6-2.6.12.orig/arch/parisc/kernel/unaligned.c 2005-08-09 09:52:27.000000000 -0400
++++ linux-2.6-2.6.12/arch/parisc/kernel/unaligned.c 2005-08-09 17:53:35.000000000 -0400
@@ -513,15 +513,18 @@
register int flop=0; /* true if this is a flop */
@@ -3454,9 +3506,30 @@
if (!unaligned_enabled)
goto force_sigbus;
}
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/drivers/block/Kconfig CVS2_6_12_PA2/drivers/block/Kconfig
---- LINUS_2_6_12/drivers/block/Kconfig 2005-06-17 21:21:57.000000000 -0600
-+++ CVS2_6_12_PA2/drivers/block/Kconfig 2005-05-08 20:00:21.000000000 -0600
+Index: linux-2.6-2.6.12/arch/parisc/lib/memcpy.c
+===================================================================
+--- linux-2.6-2.6.12.orig/arch/parisc/lib/memcpy.c 2005-08-09 09:52:27.000000000 -0400
++++ linux-2.6-2.6.12/arch/parisc/lib/memcpy.c 2005-08-09 17:53:35.000000000 -0400
+@@ -339,6 +339,7 @@
+ pds = (double *)pcs;
+ pdd = (double *)pcd;
+
++#if 0
+ /* Copy 8 doubles at a time */
+ while (len >= 8*sizeof(double)) {
+ register double r1, r2, r3, r4, r5, r6, r7, r8;
+@@ -366,6 +367,7 @@
+ fstdma(d_space, r8, pdd, pmc_store_exc);
+ len -= 8*sizeof(double);
+ }
++#endif
+
+ pws = (unsigned int *)pds;
+ pwd = (unsigned int *)pdd;
+Index: linux-2.6-2.6.12/drivers/block/Kconfig
+===================================================================
+--- linux-2.6-2.6.12.orig/drivers/block/Kconfig 2005-08-09 09:52:27.000000000 -0400
++++ linux-2.6-2.6.12/drivers/block/Kconfig 2005-08-09 17:53:35.000000000 -0400
@@ -6,7 +6,7 @@
config BLK_DEV_FD
@@ -3466,9 +3539,10 @@
---help---
If you want to use the floppy disk drive(s) of your PC under Linux,
say Y. Information about this driver, especially important for IBM
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/drivers/ide/Kconfig CVS2_6_12_PA2/drivers/ide/Kconfig
---- LINUS_2_6_12/drivers/ide/Kconfig 2005-06-17 21:21:58.000000000 -0600
-+++ CVS2_6_12_PA2/drivers/ide/Kconfig 2005-03-18 06:16:50.000000000 -0700
+Index: linux-2.6-2.6.12/drivers/ide/Kconfig
+===================================================================
+--- linux-2.6-2.6.12.orig/drivers/ide/Kconfig 2005-08-09 17:50:50.000000000 -0400
++++ linux-2.6-2.6.12/drivers/ide/Kconfig 2005-08-09 17:53:35.000000000 -0400
@@ -610,7 +610,7 @@
tristate "NS87415 chipset support"
help
@@ -3478,9 +3552,10 @@
Please read the comments at the top of <file:drivers/ide/pci/ns87415.c>.
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/drivers/input/keyboard/hil_kbd.c CVS2_6_12_PA2/drivers/input/keyboard/hil_kbd.c
---- LINUS_2_6_12/drivers/input/keyboard/hil_kbd.c 2005-06-17 21:21:59.000000000 -0600
-+++ CVS2_6_12_PA2/drivers/input/keyboard/hil_kbd.c 2005-03-25 22:00:08.000000000 -0700
+Index: linux-2.6-2.6.12/drivers/input/keyboard/hil_kbd.c
+===================================================================
+--- linux-2.6-2.6.12.orig/drivers/input/keyboard/hil_kbd.c 2005-08-09 09:52:27.000000000 -0400
++++ linux-2.6-2.6.12/drivers/input/keyboard/hil_kbd.c 2005-08-09 17:53:35.000000000 -0400
@@ -204,7 +204,7 @@
hil_packet packet;
int idx;
@@ -3558,9 +3633,10 @@
.connect = hil_kbd_connect,
.disconnect = hil_kbd_disconnect,
.interrupt = hil_kbd_interrupt
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/drivers/input/keyboard/hilkbd.c CVS2_6_12_PA2/drivers/input/keyboard/hilkbd.c
---- LINUS_2_6_12/drivers/input/keyboard/hilkbd.c 2005-06-17 21:21:59.000000000 -0600
-+++ CVS2_6_12_PA2/drivers/input/keyboard/hilkbd.c 2005-01-11 07:11:34.000000000 -0700
+Index: linux-2.6-2.6.12/drivers/input/keyboard/hilkbd.c
+===================================================================
+--- linux-2.6-2.6.12.orig/drivers/input/keyboard/hilkbd.c 2005-08-09 09:52:27.000000000 -0400
++++ linux-2.6-2.6.12/drivers/input/keyboard/hilkbd.c 2005-08-09 17:53:35.000000000 -0400
@@ -22,7 +22,7 @@
#include <linux/errno.h>
#include <linux/input.h>
@@ -3570,9 +3646,10 @@
#include <linux/hil.h>
#include <linux/spinlock.h>
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/drivers/input/mouse/hil_ptr.c CVS2_6_12_PA2/drivers/input/mouse/hil_ptr.c
---- LINUS_2_6_12/drivers/input/mouse/hil_ptr.c 2005-06-17 21:21:59.000000000 -0600
-+++ CVS2_6_12_PA2/drivers/input/mouse/hil_ptr.c 2005-03-25 22:00:10.000000000 -0700
+Index: linux-2.6-2.6.12/drivers/input/mouse/hil_ptr.c
+===================================================================
+--- linux-2.6-2.6.12.orig/drivers/input/mouse/hil_ptr.c 2005-08-09 09:52:27.000000000 -0400
++++ linux-2.6-2.6.12/drivers/input/mouse/hil_ptr.c 2005-08-09 17:53:35.000000000 -0400
@@ -196,7 +196,7 @@
hil_packet packet;
int idx;
@@ -3656,9 +3733,10 @@
};
static int __init hil_ptr_init(void)
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/drivers/input/serio/hil_mlc.c CVS2_6_12_PA2/drivers/input/serio/hil_mlc.c
---- LINUS_2_6_12/drivers/input/serio/hil_mlc.c 2005-06-17 21:21:59.000000000 -0600
-+++ CVS2_6_12_PA2/drivers/input/serio/hil_mlc.c 2005-04-04 14:46:50.000000000 -0600
+Index: linux-2.6-2.6.12/drivers/input/serio/hil_mlc.c
+===================================================================
+--- linux-2.6-2.6.12.orig/drivers/input/serio/hil_mlc.c 2005-08-09 09:52:27.000000000 -0400
++++ linux-2.6-2.6.12/drivers/input/serio/hil_mlc.c 2005-08-09 17:53:35.000000000 -0400
@@ -801,7 +801,8 @@
struct hil_mlc_serio_map *map;
struct hil_mlc *mlc;
@@ -3698,9 +3776,10 @@
mlc_serio->write = hil_mlc_serio_write;
mlc_serio->open = hil_mlc_serio_open;
mlc_serio->close = hil_mlc_serio_close;
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/drivers/isdn/hisax/Kconfig CVS2_6_12_PA2/drivers/isdn/hisax/Kconfig
---- LINUS_2_6_12/drivers/isdn/hisax/Kconfig 2005-06-17 21:22:00.000000000 -0600
-+++ CVS2_6_12_PA2/drivers/isdn/hisax/Kconfig 2005-03-18 06:16:55.000000000 -0700
+Index: linux-2.6-2.6.12/drivers/isdn/hisax/Kconfig
+===================================================================
+--- linux-2.6-2.6.12.orig/drivers/isdn/hisax/Kconfig 2005-08-09 09:52:27.000000000 -0400
++++ linux-2.6-2.6.12/drivers/isdn/hisax/Kconfig 2005-08-09 17:53:35.000000000 -0400
@@ -110,7 +110,7 @@
config HISAX_TELESPCI
@@ -3754,9 +3833,10 @@
help
This enables HiSax support for the AMD7930 chips on some SPARCs.
This code is not finished yet.
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/drivers/isdn/pcbit/Kconfig CVS2_6_12_PA2/drivers/isdn/pcbit/Kconfig
---- LINUS_2_6_12/drivers/isdn/pcbit/Kconfig 2005-06-17 21:22:00.000000000 -0600
-+++ CVS2_6_12_PA2/drivers/isdn/pcbit/Kconfig 2005-03-07 08:07:30.000000000 -0700
+Index: linux-2.6-2.6.12/drivers/isdn/pcbit/Kconfig
+===================================================================
+--- linux-2.6-2.6.12.orig/drivers/isdn/pcbit/Kconfig 2005-08-09 09:52:27.000000000 -0400
++++ linux-2.6-2.6.12/drivers/isdn/pcbit/Kconfig 2005-08-09 17:53:35.000000000 -0400
@@ -3,7 +3,7 @@
#
config ISDN_DRV_PCBIT
@@ -3766,9 +3846,10 @@
help
This enables support for the PCBIT ISDN-card. This card is
manufactured in Portugal by Octal. For running this card,
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/drivers/net/tulip/media.c CVS2_6_12_PA2/drivers/net/tulip/media.c
---- LINUS_2_6_12/drivers/net/tulip/media.c 2005-06-17 21:22:02.000000000 -0600
-+++ CVS2_6_12_PA2/drivers/net/tulip/media.c 2005-06-11 11:12:08.000000000 -0600
+Index: linux-2.6-2.6.12/drivers/net/tulip/media.c
+===================================================================
+--- linux-2.6-2.6.12.orig/drivers/net/tulip/media.c 2005-08-09 09:52:27.000000000 -0400
++++ linux-2.6-2.6.12/drivers/net/tulip/media.c 2005-08-09 17:53:35.000000000 -0400
@@ -44,8 +44,10 @@
/* MII transceiver control section.
@@ -3840,9 +3921,10 @@
tmp_info = get_u16(&misc_info[1]);
if (tmp_info)
tp->advertising[phy_num] = tmp_info | 1;
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/drivers/net/tulip/tulip.h CVS2_6_12_PA2/drivers/net/tulip/tulip.h
---- LINUS_2_6_12/drivers/net/tulip/tulip.h 2005-06-17 21:22:02.000000000 -0600
-+++ CVS2_6_12_PA2/drivers/net/tulip/tulip.h 2005-03-18 06:17:09.000000000 -0700
+Index: linux-2.6-2.6.12/drivers/net/tulip/tulip.h
+===================================================================
+--- linux-2.6-2.6.12.orig/drivers/net/tulip/tulip.h 2005-08-09 09:52:27.000000000 -0400
++++ linux-2.6-2.6.12/drivers/net/tulip/tulip.h 2005-08-09 17:53:35.000000000 -0400
@@ -475,8 +475,11 @@
udelay(10);
@@ -3857,9 +3939,10 @@
}
}
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/drivers/net/tulip/tulip_core.c CVS2_6_12_PA2/drivers/net/tulip/tulip_core.c
---- LINUS_2_6_12/drivers/net/tulip/tulip_core.c 2005-06-17 21:22:02.000000000 -0600
-+++ CVS2_6_12_PA2/drivers/net/tulip/tulip_core.c 2005-05-25 11:12:47.000000000 -0600
+Index: linux-2.6-2.6.12/drivers/net/tulip/tulip_core.c
+===================================================================
+--- linux-2.6-2.6.12.orig/drivers/net/tulip/tulip_core.c 2005-08-09 09:52:27.000000000 -0400
++++ linux-2.6-2.6.12/drivers/net/tulip/tulip_core.c 2005-08-09 17:53:35.000000000 -0400
@@ -22,7 +22,7 @@
#else
#define DRV_VERSION "1.1.13"
@@ -3878,9 +3961,10 @@
HAS_MII | HAS_MEDIA_TABLE | ALWAYS_CHECK_MII | HAS_ACPI | HAS_NWAY
| HAS_INTR_MITIGATION | HAS_PCI_MWI, t21142_timer },
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/drivers/parisc/ccio-dma.c CVS2_6_12_PA2/drivers/parisc/ccio-dma.c
---- LINUS_2_6_12/drivers/parisc/ccio-dma.c 2005-06-17 21:22:02.000000000 -0600
-+++ CVS2_6_12_PA2/drivers/parisc/ccio-dma.c 2005-05-21 20:22:23.000000000 -0600
+Index: linux-2.6-2.6.12/drivers/parisc/ccio-dma.c
+===================================================================
+--- linux-2.6-2.6.12.orig/drivers/parisc/ccio-dma.c 2005-08-09 09:52:27.000000000 -0400
++++ linux-2.6-2.6.12/drivers/parisc/ccio-dma.c 2005-08-09 17:53:35.000000000 -0400
@@ -100,9 +100,9 @@
#define DBG_RUN_SG(x...)
#endif
@@ -4110,9 +4194,10 @@
ccio_ioc_init(ioc);
ccio_init_resources(ioc);
hppa_dma_ops = &ccio_ops;
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/drivers/parisc/led.c CVS2_6_12_PA2/drivers/parisc/led.c
---- LINUS_2_6_12/drivers/parisc/led.c 2005-06-17 21:22:02.000000000 -0600
-+++ CVS2_6_12_PA2/drivers/parisc/led.c 2005-04-05 13:01:50.000000000 -0600
+Index: linux-2.6-2.6.12/drivers/parisc/led.c
+===================================================================
+--- linux-2.6-2.6.12.orig/drivers/parisc/led.c 2005-08-09 09:52:27.000000000 -0400
++++ linux-2.6-2.6.12/drivers/parisc/led.c 2005-08-09 17:53:35.000000000 -0400
@@ -18,6 +18,9 @@
* Changes:
* - Audit copy_from_user in led_proc_write.
@@ -4493,9 +4578,23 @@
return lcd_info.lcd_width;
}
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/drivers/parisc/sba_iommu.c CVS2_6_12_PA2/drivers/parisc/sba_iommu.c
---- LINUS_2_6_12/drivers/parisc/sba_iommu.c 2005-06-17 21:22:02.000000000 -0600
-+++ CVS2_6_12_PA2/drivers/parisc/sba_iommu.c 2005-05-20 09:19:47.000000000 -0600
+Index: linux-2.6-2.6.12/drivers/parisc/pdc_stable.c
+===================================================================
+--- linux-2.6-2.6.12.orig/drivers/parisc/pdc_stable.c 2005-08-09 09:52:27.000000000 -0400
++++ linux-2.6-2.6.12/drivers/parisc/pdc_stable.c 2005-08-09 17:53:35.000000000 -0400
+@@ -536,7 +536,7 @@
+
+ out += sprintf(out, "Memory tested: ");
+ if ((result & 0x0F) < 0x0E)
+- out += sprintf(out, "%.3f MB", 0.256*(1<<(result & 0x0F)));
++ out += sprintf(out, "%d kB", (1<<(result & 0x0F))*256);
+ else
+ out += sprintf(out, "All");
+ out += sprintf(out, "\n");
+Index: linux-2.6-2.6.12/drivers/parisc/sba_iommu.c
+===================================================================
+--- linux-2.6-2.6.12.orig/drivers/parisc/sba_iommu.c 2005-08-09 09:52:27.000000000 -0400
++++ linux-2.6-2.6.12/drivers/parisc/sba_iommu.c 2005-08-09 17:53:35.000000000 -0400
@@ -91,7 +91,7 @@
#define DBG_RES(x...)
#endif
@@ -4663,9 +4762,10 @@
/* FIXME : DMA HINTs not used */
ioc->hint_shift_pdir = iov_order + PAGE_SHIFT;
ioc->hint_mask_pdir = ~(0x3 << (iov_order + PAGE_SHIFT));
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/drivers/pcmcia/Kconfig CVS2_6_12_PA2/drivers/pcmcia/Kconfig
---- LINUS_2_6_12/drivers/pcmcia/Kconfig 2005-06-17 21:22:03.000000000 -0600
-+++ CVS2_6_12_PA2/drivers/pcmcia/Kconfig 2005-03-18 06:17:12.000000000 -0700
+Index: linux-2.6-2.6.12/drivers/pcmcia/Kconfig
+===================================================================
+--- linux-2.6-2.6.12.orig/drivers/pcmcia/Kconfig 2005-08-09 09:52:27.000000000 -0400
++++ linux-2.6-2.6.12/drivers/pcmcia/Kconfig 2005-08-09 17:53:35.000000000 -0400
@@ -166,7 +166,11 @@
config PCMCIA_PROBE
@@ -4679,9 +4779,10 @@
config M32R_PCC
bool "M32R PCMCIA I/F"
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/drivers/pcmcia/rsrc_nonstatic.c CVS2_6_12_PA2/drivers/pcmcia/rsrc_nonstatic.c
---- LINUS_2_6_12/drivers/pcmcia/rsrc_nonstatic.c 2005-06-17 21:22:03.000000000 -0600
-+++ CVS2_6_12_PA2/drivers/pcmcia/rsrc_nonstatic.c 2005-04-04 14:46:59.000000000 -0600
+Index: linux-2.6-2.6.12/drivers/pcmcia/rsrc_nonstatic.c
+===================================================================
+--- linux-2.6-2.6.12.orig/drivers/pcmcia/rsrc_nonstatic.c 2005-08-09 09:52:27.000000000 -0400
++++ linux-2.6-2.6.12/drivers/pcmcia/rsrc_nonstatic.c 2005-08-09 17:53:35.000000000 -0400
@@ -43,7 +43,11 @@
#define INT_MODULE_PARM(n, v) static int n = v; module_param(n, int, 0444)
@@ -4694,9 +4795,10 @@
#ifdef CONFIG_PCMCIA_PROBE
INT_MODULE_PARM(probe_io, 1); /* IO port probe? */
INT_MODULE_PARM(mem_limit, 0x10000);
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/drivers/scsi/53c700.c CVS2_6_12_PA2/drivers/scsi/53c700.c
---- LINUS_2_6_12/drivers/scsi/53c700.c 2005-06-17 21:22:03.000000000 -0600
-+++ CVS2_6_12_PA2/drivers/scsi/53c700.c 2005-04-21 18:25:51.000000000 -0600
+Index: linux-2.6-2.6.12/drivers/scsi/53c700.c
+===================================================================
+--- linux-2.6-2.6.12.orig/drivers/scsi/53c700.c 2005-08-09 09:52:27.000000000 -0400
++++ linux-2.6-2.6.12/drivers/scsi/53c700.c 2005-08-09 17:53:35.000000000 -0400
@@ -302,6 +302,7 @@
__u8 *memory;
__u32 *script;
@@ -4721,9 +4823,10 @@
/* reset the chip */
NCR_700_chip_reset(host);
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/drivers/scsi/lasi700.c CVS2_6_12_PA2/drivers/scsi/lasi700.c
---- LINUS_2_6_12/drivers/scsi/lasi700.c 2005-06-17 21:22:03.000000000 -0600
-+++ CVS2_6_12_PA2/drivers/scsi/lasi700.c 2005-04-21 22:23:44.000000000 -0600
+Index: linux-2.6-2.6.12/drivers/scsi/lasi700.c
+===================================================================
+--- linux-2.6-2.6.12.orig/drivers/scsi/lasi700.c 2005-08-09 09:52:27.000000000 -0400
++++ linux-2.6-2.6.12/drivers/scsi/lasi700.c 2005-08-09 17:53:35.000000000 -0400
@@ -125,8 +125,6 @@
hostdata->dmode_extra = DMODE_FC2;
}
@@ -4733,9 +4836,10 @@
host = NCR_700_detect(&lasi700_template, hostdata, &dev->dev);
if (!host)
goto out_kfree;
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/drivers/scsi/sym53c8xx_2/sym_defs.h CVS2_6_12_PA2/drivers/scsi/sym53c8xx_2/sym_defs.h
---- LINUS_2_6_12/drivers/scsi/sym53c8xx_2/sym_defs.h 2005-06-17 21:22:04.000000000 -0600
-+++ CVS2_6_12_PA2/drivers/scsi/sym53c8xx_2/sym_defs.h 2005-05-20 07:08:58.000000000 -0600
+Index: linux-2.6-2.6.12/drivers/scsi/sym53c8xx_2/sym_defs.h
+===================================================================
+--- linux-2.6-2.6.12.orig/drivers/scsi/sym53c8xx_2/sym_defs.h 2005-08-09 09:52:27.000000000 -0400
++++ linux-2.6-2.6.12/drivers/scsi/sym53c8xx_2/sym_defs.h 2005-08-09 17:53:35.000000000 -0400
@@ -40,7 +40,7 @@
#ifndef SYM_DEFS_H
#define SYM_DEFS_H
@@ -4745,9 +4849,10 @@
#define SYM_DRIVER_NAME "sym-" SYM_VERSION
/*
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/drivers/scsi/sym53c8xx_2/sym_glue.c CVS2_6_12_PA2/drivers/scsi/sym53c8xx_2/sym_glue.c
---- LINUS_2_6_12/drivers/scsi/sym53c8xx_2/sym_glue.c 2005-06-17 21:22:04.000000000 -0600
-+++ CVS2_6_12_PA2/drivers/scsi/sym53c8xx_2/sym_glue.c 2005-05-20 12:24:41.000000000 -0600
+Index: linux-2.6-2.6.12/drivers/scsi/sym53c8xx_2/sym_glue.c
+===================================================================
+--- linux-2.6-2.6.12.orig/drivers/scsi/sym53c8xx_2/sym_glue.c 2005-08-09 09:52:27.000000000 -0400
++++ linux-2.6-2.6.12/drivers/scsi/sym53c8xx_2/sym_glue.c 2005-08-09 17:53:35.000000000 -0400
@@ -155,10 +155,11 @@
base = tmp;
if ((tmp & 0x7) == PCI_BASE_ADDRESS_MEM_TYPE_64) {
@@ -4969,9 +5074,10 @@
.eh_abort_handler = sym53c8xx_eh_abort_handler,
.eh_device_reset_handler = sym53c8xx_eh_device_reset_handler,
.eh_bus_reset_handler = sym53c8xx_eh_bus_reset_handler,
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/drivers/scsi/sym53c8xx_2/sym_glue.h CVS2_6_12_PA2/drivers/scsi/sym53c8xx_2/sym_glue.h
---- LINUS_2_6_12/drivers/scsi/sym53c8xx_2/sym_glue.h 2005-06-17 21:22:04.000000000 -0600
-+++ CVS2_6_12_PA2/drivers/scsi/sym53c8xx_2/sym_glue.h 2005-05-20 06:29:44.000000000 -0600
+Index: linux-2.6-2.6.12/drivers/scsi/sym53c8xx_2/sym_glue.h
+===================================================================
+--- linux-2.6-2.6.12.orig/drivers/scsi/sym53c8xx_2/sym_glue.h 2005-08-09 09:52:27.000000000 -0400
++++ linux-2.6-2.6.12/drivers/scsi/sym53c8xx_2/sym_glue.h 2005-08-09 17:53:35.000000000 -0400
@@ -142,33 +142,6 @@
#define scr_to_cpu(dw) le32_to_cpu(dw)
@@ -5006,9 +5112,10 @@
* These ones are used as return code from
* error recovery handlers under Linux.
*/
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/drivers/scsi/sym53c8xx_2/sym_hipd.c CVS2_6_12_PA2/drivers/scsi/sym53c8xx_2/sym_hipd.c
---- LINUS_2_6_12/drivers/scsi/sym53c8xx_2/sym_hipd.c 2005-06-17 21:22:04.000000000 -0600
-+++ CVS2_6_12_PA2/drivers/scsi/sym53c8xx_2/sym_hipd.c 2005-05-20 12:27:31.000000000 -0600
+Index: linux-2.6-2.6.12/drivers/scsi/sym53c8xx_2/sym_hipd.c
+===================================================================
+--- linux-2.6-2.6.12.orig/drivers/scsi/sym53c8xx_2/sym_hipd.c 2005-08-09 09:52:27.000000000 -0400
++++ linux-2.6-2.6.12/drivers/scsi/sym53c8xx_2/sym_hipd.c 2005-08-09 17:53:35.000000000 -0400
@@ -97,7 +97,7 @@
static void sym_print_nego_msg(struct sym_hcb *np, int target, char *label, u_char *msg)
{
@@ -5284,9 +5391,10 @@
goto finish;
}
weirdness:
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/drivers/scsi/sym53c8xx_2/sym_hipd.h CVS2_6_12_PA2/drivers/scsi/sym53c8xx_2/sym_hipd.h
---- LINUS_2_6_12/drivers/scsi/sym53c8xx_2/sym_hipd.h 2005-06-17 21:22:04.000000000 -0600
-+++ CVS2_6_12_PA2/drivers/scsi/sym53c8xx_2/sym_hipd.h 2005-05-19 20:41:45.000000000 -0600
+Index: linux-2.6-2.6.12/drivers/scsi/sym53c8xx_2/sym_hipd.h
+===================================================================
+--- linux-2.6-2.6.12.orig/drivers/scsi/sym53c8xx_2/sym_hipd.h 2005-08-09 09:52:27.000000000 -0400
++++ linux-2.6-2.6.12/drivers/scsi/sym53c8xx_2/sym_hipd.h 2005-08-09 17:53:35.000000000 -0400
@@ -444,7 +444,7 @@
*/
u_char usrflags;
@@ -5366,9 +5474,10 @@
cp->phys.head.savep = cpu_to_scr(SCRIPTB_BA(np, data_io));
#endif
}
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/drivers/scsi/sym53c8xx_2/sym_nvram.c CVS2_6_12_PA2/drivers/scsi/sym53c8xx_2/sym_nvram.c
---- LINUS_2_6_12/drivers/scsi/sym53c8xx_2/sym_nvram.c 2005-06-17 21:22:04.000000000 -0600
-+++ CVS2_6_12_PA2/drivers/scsi/sym53c8xx_2/sym_nvram.c 2005-05-20 12:24:41.000000000 -0600
+Index: linux-2.6-2.6.12/drivers/scsi/sym53c8xx_2/sym_nvram.c
+===================================================================
+--- linux-2.6-2.6.12.orig/drivers/scsi/sym53c8xx_2/sym_nvram.c 2005-08-09 09:52:27.000000000 -0400
++++ linux-2.6-2.6.12/drivers/scsi/sym53c8xx_2/sym_nvram.c 2005-08-09 17:53:35.000000000 -0400
@@ -270,6 +270,7 @@
}
@@ -5411,9 +5520,10 @@
{
return 0;
}
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/drivers/serial/mux.c CVS2_6_12_PA2/drivers/serial/mux.c
---- LINUS_2_6_12/drivers/serial/mux.c 2005-06-17 21:22:04.000000000 -0600
-+++ CVS2_6_12_PA2/drivers/serial/mux.c 2005-02-14 07:56:20.000000000 -0700
+Index: linux-2.6-2.6.12/drivers/serial/mux.c
+===================================================================
+--- linux-2.6-2.6.12.orig/drivers/serial/mux.c 2005-08-09 09:52:27.000000000 -0400
++++ linux-2.6-2.6.12/drivers/serial/mux.c 2005-08-09 17:53:35.000000000 -0400
@@ -27,6 +27,7 @@
#include <linux/delay.h> /* for udelay */
#include <linux/device.h>
@@ -5431,10 +5541,11 @@
port->uartclk = 0;
port->fifosize = MUX_FIFO_SIZE;
port->ops = &mux_pops;
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/drivers/serial/serial_core.c CVS2_6_12_PA2/drivers/serial/serial_core.c
---- LINUS_2_6_12/drivers/serial/serial_core.c 2005-06-17 21:22:04.000000000 -0600
-+++ CVS2_6_12_PA2/drivers/serial/serial_core.c 2005-04-04 14:47:03.000000000 -0600
-@@ -1929,7 +1929,14 @@
+Index: linux-2.6-2.6.12/drivers/serial/serial_core.c
+===================================================================
+--- linux-2.6-2.6.12.orig/drivers/serial/serial_core.c 2005-08-09 17:50:50.000000000 -0400
++++ linux-2.6-2.6.12/drivers/serial/serial_core.c 2005-08-09 17:53:35.000000000 -0400
+@@ -1930,7 +1930,14 @@
printk("MMIO 0x%lx", port->mapbase);
break;
}
@@ -5450,9 +5561,10 @@
}
static void
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/drivers/usb/input/hid-core.c CVS2_6_12_PA2/drivers/usb/input/hid-core.c
---- LINUS_2_6_12/drivers/usb/input/hid-core.c 2005-06-17 21:22:05.000000000 -0600
-+++ CVS2_6_12_PA2/drivers/usb/input/hid-core.c 2005-06-11 11:12:11.000000000 -0600
+Index: linux-2.6-2.6.12/drivers/usb/input/hid-core.c
+===================================================================
+--- linux-2.6-2.6.12.orig/drivers/usb/input/hid-core.c 2005-08-09 09:52:27.000000000 -0400
++++ linux-2.6-2.6.12/drivers/usb/input/hid-core.c 2005-08-09 17:53:35.000000000 -0400
@@ -759,21 +759,31 @@
}
@@ -5492,9 +5604,10 @@
}
/*
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/drivers/usb/storage/transport.c CVS2_6_12_PA2/drivers/usb/storage/transport.c
---- LINUS_2_6_12/drivers/usb/storage/transport.c 2005-06-17 21:22:06.000000000 -0600
-+++ CVS2_6_12_PA2/drivers/usb/storage/transport.c 2005-06-04 13:21:10.000000000 -0600
+Index: linux-2.6-2.6.12/drivers/usb/storage/transport.c
+===================================================================
+--- linux-2.6-2.6.12.orig/drivers/usb/storage/transport.c 2005-08-09 09:52:27.000000000 -0400
++++ linux-2.6-2.6.12/drivers/usb/storage/transport.c 2005-08-09 17:53:35.000000000 -0400
@@ -266,8 +266,9 @@
NULL, 0, 3*HZ);
@@ -5544,9 +5657,10 @@
US_DEBUGP("Soft reset failed\n");
goto Done;
}
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/drivers/video/console/Kconfig CVS2_6_12_PA2/drivers/video/console/Kconfig
---- LINUS_2_6_12/drivers/video/console/Kconfig 2005-06-17 21:22:07.000000000 -0600
-+++ CVS2_6_12_PA2/drivers/video/console/Kconfig 2005-03-15 10:06:49.000000000 -0700
+Index: linux-2.6-2.6.12/drivers/video/console/Kconfig
+===================================================================
+--- linux-2.6-2.6.12.orig/drivers/video/console/Kconfig 2005-08-09 09:52:27.000000000 -0400
++++ linux-2.6-2.6.12/drivers/video/console/Kconfig 2005-08-09 17:53:35.000000000 -0400
@@ -110,7 +110,7 @@
config FONTS
@@ -5583,9 +5697,10 @@
default y if !SPARC32 && !SPARC64 && !FONTS && MAC
help
Small console font with Macintosh-style high-half glyphs. Some Mac
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/fs/ioctl.c CVS2_6_12_PA2/fs/ioctl.c
---- LINUS_2_6_12/fs/ioctl.c 2005-06-17 21:22:07.000000000 -0600
-+++ CVS2_6_12_PA2/fs/ioctl.c 2005-03-14 06:24:36.000000000 -0700
+Index: linux-2.6-2.6.12/fs/ioctl.c
+===================================================================
+--- linux-2.6-2.6.12.orig/fs/ioctl.c 2005-08-09 09:52:27.000000000 -0400
++++ linux-2.6-2.6.12/fs/ioctl.c 2005-08-09 17:53:35.000000000 -0400
@@ -71,7 +71,11 @@
return -EBADF;
return put_user(inode->i_sb->s_blocksize, p);
@@ -5599,9 +5714,10 @@
}
return do_ioctl(filp, cmd, arg);
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/include/asm-generic/compat_signal.h CVS2_6_12_PA2/include/asm-generic/compat_signal.h
---- LINUS_2_6_12/include/asm-generic/compat_signal.h 1969-12-31 17:00:00.000000000 -0700
-+++ CVS2_6_12_PA2/include/asm-generic/compat_signal.h 2004-01-27 22:12:47.000000000 -0700
+Index: linux-2.6-2.6.12/include/asm-generic/compat_signal.h
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ linux-2.6-2.6.12/include/asm-generic/compat_signal.h 2005-08-09 17:53:35.000000000 -0400
@@ -0,0 +1,25 @@
+#ifndef _ASM_GENERIC_COMPAT_SIGNAL_H
+#define _ASM_GENERIC_COMPAT_SIGNAL_H
@@ -5628,9 +5744,10 @@
+
+#endif /* !__ASSEMBLY__ */
+#endif /* !_ASM_GENERIC_COMPAT_SIGNAL_H */
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/include/asm-ia64/compat.h CVS2_6_12_PA2/include/asm-ia64/compat.h
---- LINUS_2_6_12/include/asm-ia64/compat.h 2005-06-17 21:22:11.000000000 -0600
-+++ CVS2_6_12_PA2/include/asm-ia64/compat.h 2004-10-11 15:41:31.000000000 -0600
+Index: linux-2.6-2.6.12/include/asm-ia64/compat.h
+===================================================================
+--- linux-2.6-2.6.12.orig/include/asm-ia64/compat.h 2005-08-09 09:52:27.000000000 -0400
++++ linux-2.6-2.6.12/include/asm-ia64/compat.h 2005-08-09 17:53:35.000000000 -0400
@@ -15,6 +15,9 @@
typedef s32 compat_pid_t;
typedef u16 compat_uid_t;
@@ -5649,9 +5766,10 @@
typedef s32 compat_int_t;
typedef s32 compat_long_t;
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/include/asm-parisc/assembly.h CVS2_6_12_PA2/include/asm-parisc/assembly.h
---- LINUS_2_6_12/include/asm-parisc/assembly.h 2005-06-17 21:22:14.000000000 -0600
-+++ CVS2_6_12_PA2/include/asm-parisc/assembly.h 2005-05-12 22:39:05.000000000 -0600
+Index: linux-2.6-2.6.12/include/asm-parisc/assembly.h
+===================================================================
+--- linux-2.6-2.6.12.orig/include/asm-parisc/assembly.h 2005-08-09 09:52:27.000000000 -0400
++++ linux-2.6-2.6.12/include/asm-parisc/assembly.h 2005-08-09 17:53:35.000000000 -0400
@@ -450,5 +450,30 @@
REST_CR (%cr22, PT_PSW (\regs))
.endm
@@ -5683,9 +5801,10 @@
+
#endif /* __ASSEMBLY__ */
#endif
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/include/asm-parisc/bitops.h CVS2_6_12_PA2/include/asm-parisc/bitops.h
---- LINUS_2_6_12/include/asm-parisc/bitops.h 2005-06-17 21:22:14.000000000 -0600
-+++ CVS2_6_12_PA2/include/asm-parisc/bitops.h 2005-06-03 23:42:21.000000000 -0600
+Index: linux-2.6-2.6.12/include/asm-parisc/bitops.h
+===================================================================
+--- linux-2.6-2.6.12.orig/include/asm-parisc/bitops.h 2005-08-09 09:52:27.000000000 -0400
++++ linux-2.6-2.6.12/include/asm-parisc/bitops.h 2005-08-09 17:53:35.000000000 -0400
@@ -2,6 +2,7 @@
#define _PARISC_BITOPS_H
@@ -6145,9 +6264,10 @@
/* Bitmap functions for the minix filesystem. */
#define minix_test_and_set_bit(nr,addr) ext2_set_bit(nr,addr)
#define minix_set_bit(nr,addr) ((void)ext2_set_bit(nr,addr))
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/include/asm-parisc/errno.h CVS2_6_12_PA2/include/asm-parisc/errno.h
---- LINUS_2_6_12/include/asm-parisc/errno.h 2005-06-17 21:22:14.000000000 -0600
-+++ CVS2_6_12_PA2/include/asm-parisc/errno.h 2005-05-08 20:00:54.000000000 -0600
+Index: linux-2.6-2.6.12/include/asm-parisc/errno.h
+===================================================================
+--- linux-2.6-2.6.12.orig/include/asm-parisc/errno.h 2005-08-09 09:52:27.000000000 -0400
++++ linux-2.6-2.6.12/include/asm-parisc/errno.h 2005-08-09 17:53:35.000000000 -0400
@@ -114,6 +114,7 @@
#define ENOTSUP 252 /* Function not implemented (POSIX.4 / HPUX) */
@@ -6156,9 +6276,10 @@
/* for robust mutexes */
#define EOWNERDEAD 254 /* Owner died */
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/include/asm-parisc/led.h CVS2_6_12_PA2/include/asm-parisc/led.h
---- LINUS_2_6_12/include/asm-parisc/led.h 2005-06-17 21:22:14.000000000 -0600
-+++ CVS2_6_12_PA2/include/asm-parisc/led.h 2005-03-27 23:50:20.000000000 -0700
+Index: linux-2.6-2.6.12/include/asm-parisc/led.h
+===================================================================
+--- linux-2.6-2.6.12.orig/include/asm-parisc/led.h 2005-08-09 09:52:27.000000000 -0400
++++ linux-2.6-2.6.12/include/asm-parisc/led.h 2005-08-09 17:53:35.000000000 -0400
@@ -23,9 +23,6 @@
#define LED_CMD_REG_NONE 0 /* NULL == no addr for the cmd register */
@@ -6169,9 +6290,10 @@
/* register_led_driver() */
int __init register_led_driver(int model, unsigned long cmd_reg, unsigned long data_reg);
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/include/asm-parisc/processor.h CVS2_6_12_PA2/include/asm-parisc/processor.h
---- LINUS_2_6_12/include/asm-parisc/processor.h 2005-06-17 21:22:14.000000000 -0600
-+++ CVS2_6_12_PA2/include/asm-parisc/processor.h 2005-05-19 18:05:13.000000000 -0600
+Index: linux-2.6-2.6.12/include/asm-parisc/processor.h
+===================================================================
+--- linux-2.6-2.6.12.orig/include/asm-parisc/processor.h 2005-08-09 09:52:27.000000000 -0400
++++ linux-2.6-2.6.12/include/asm-parisc/processor.h 2005-08-09 17:53:35.000000000 -0400
@@ -121,8 +121,27 @@
};
@@ -6200,9 +6322,10 @@
#define INIT_THREAD { \
regs: { gr: { 0, }, \
fr: { 0, }, \
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/include/asm-parisc/psw.h CVS2_6_12_PA2/include/asm-parisc/psw.h
---- LINUS_2_6_12/include/asm-parisc/psw.h 2005-06-17 21:22:14.000000000 -0600
-+++ CVS2_6_12_PA2/include/asm-parisc/psw.h 2005-05-12 22:39:05.000000000 -0600
+Index: linux-2.6-2.6.12/include/asm-parisc/psw.h
+===================================================================
+--- linux-2.6-2.6.12.orig/include/asm-parisc/psw.h 2005-08-09 09:52:27.000000000 -0400
++++ linux-2.6-2.6.12/include/asm-parisc/psw.h 2005-08-09 17:53:35.000000000 -0400
@@ -1,4 +1,7 @@
#ifndef _PARISC_PSW_H
+
@@ -6275,9 +6398,10 @@
+#define USER_PSW (PSW_C | PSW_Q | PSW_P | PSW_D | PSW_I)
+
#endif
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/include/asm-parisc/ptrace.h CVS2_6_12_PA2/include/asm-parisc/ptrace.h
---- LINUS_2_6_12/include/asm-parisc/ptrace.h 2005-06-17 21:22:14.000000000 -0600
-+++ CVS2_6_12_PA2/include/asm-parisc/ptrace.h 2005-03-31 08:27:13.000000000 -0700
+Index: linux-2.6-2.6.12/include/asm-parisc/ptrace.h
+===================================================================
+--- linux-2.6-2.6.12.orig/include/asm-parisc/ptrace.h 2005-08-09 09:52:27.000000000 -0400
++++ linux-2.6-2.6.12/include/asm-parisc/ptrace.h 2005-08-09 17:53:35.000000000 -0400
@@ -49,7 +49,7 @@
#define user_mode(regs) (((regs)->iaoq[0] & 3) ? 1 : 0)
#define user_space(regs) (((regs)->iasq[1] != 0) ? 1 : 0)
@@ -6287,9 +6411,10 @@
extern void show_regs(struct pt_regs *);
#endif
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/include/asm-parisc/spinlock.h CVS2_6_12_PA2/include/asm-parisc/spinlock.h
---- LINUS_2_6_12/include/asm-parisc/spinlock.h 2005-06-17 21:22:14.000000000 -0600
-+++ CVS2_6_12_PA2/include/asm-parisc/spinlock.h 2005-06-09 11:52:00.000000000 -0600
+Index: linux-2.6-2.6.12/include/asm-parisc/spinlock.h
+===================================================================
+--- linux-2.6-2.6.12.orig/include/asm-parisc/spinlock.h 2005-08-09 09:52:27.000000000 -0400
++++ linux-2.6-2.6.12/include/asm-parisc/spinlock.h 2005-08-09 17:53:35.000000000 -0400
@@ -8,9 +8,15 @@
* the semaphore address has to be 16-byte aligned.
*/
@@ -6359,9 +6484,10 @@
(x)->babble--; \
printk("KERN_WARNING \
%s:%d: spin_unlock_wait(%s/%p)" \
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/include/asm-parisc/system.h CVS2_6_12_PA2/include/asm-parisc/system.h
---- LINUS_2_6_12/include/asm-parisc/system.h 2005-06-17 21:22:14.000000000 -0600
-+++ CVS2_6_12_PA2/include/asm-parisc/system.h 2005-06-09 07:40:16.000000000 -0600
+Index: linux-2.6-2.6.12/include/asm-parisc/system.h
+===================================================================
+--- linux-2.6-2.6.12.orig/include/asm-parisc/system.h 2005-08-09 09:52:27.000000000 -0400
++++ linux-2.6-2.6.12/include/asm-parisc/system.h 2005-08-09 17:53:35.000000000 -0400
@@ -138,13 +138,7 @@
#define set_wmb(var, value) do { var = value; wmb(); } while (0)
@@ -6452,9 +6578,10 @@
#define arch_align_stack(x) (x)
#endif
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/include/asm-parisc/tlbflush.h CVS2_6_12_PA2/include/asm-parisc/tlbflush.h
---- LINUS_2_6_12/include/asm-parisc/tlbflush.h 2005-06-17 21:22:14.000000000 -0600
-+++ CVS2_6_12_PA2/include/asm-parisc/tlbflush.h 2005-06-04 01:11:25.000000000 -0600
+Index: linux-2.6-2.6.12/include/asm-parisc/tlbflush.h
+===================================================================
+--- linux-2.6-2.6.12.orig/include/asm-parisc/tlbflush.h 2005-08-09 09:52:27.000000000 -0400
++++ linux-2.6-2.6.12/include/asm-parisc/tlbflush.h 2005-08-09 17:53:35.000000000 -0400
@@ -7,6 +7,26 @@
#include <linux/mm.h>
#include <asm/mmu_context.h>
@@ -6515,9 +6642,10 @@
}
}
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/include/asm-parisc/types.h CVS2_6_12_PA2/include/asm-parisc/types.h
---- LINUS_2_6_12/include/asm-parisc/types.h 2005-06-17 21:22:14.000000000 -0600
-+++ CVS2_6_12_PA2/include/asm-parisc/types.h 2005-06-03 23:42:21.000000000 -0600
+Index: linux-2.6-2.6.12/include/asm-parisc/types.h
+===================================================================
+--- linux-2.6-2.6.12.orig/include/asm-parisc/types.h 2005-08-09 09:52:27.000000000 -0400
++++ linux-2.6-2.6.12/include/asm-parisc/types.h 2005-08-09 17:53:35.000000000 -0400
@@ -33,8 +33,10 @@
#ifdef __LP64__
@@ -6529,9 +6657,10 @@
#endif
#ifndef __ASSEMBLY__
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/include/asm-parisc/unistd.h CVS2_6_12_PA2/include/asm-parisc/unistd.h
---- LINUS_2_6_12/include/asm-parisc/unistd.h 2005-06-17 21:22:14.000000000 -0600
-+++ CVS2_6_12_PA2/include/asm-parisc/unistd.h 2005-05-14 22:38:00.000000000 -0600
+Index: linux-2.6-2.6.12/include/asm-parisc/unistd.h
+===================================================================
+--- linux-2.6-2.6.12.orig/include/asm-parisc/unistd.h 2005-08-09 09:52:27.000000000 -0400
++++ linux-2.6-2.6.12/include/asm-parisc/unistd.h 2005-08-09 17:53:35.000000000 -0400
@@ -687,8 +687,8 @@
#define __NR_shmget (__NR_Linux + 194)
#define __NR_shmctl (__NR_Linux + 195)
@@ -6570,9 +6699,10 @@
K_STW_ASM_PIC \
" ble 0x100(%%sr2, %%r0)\n" \
" ldi %1, %%r20\n" \
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/include/asm-s390/compat.h CVS2_6_12_PA2/include/asm-s390/compat.h
---- LINUS_2_6_12/include/asm-s390/compat.h 2005-06-17 21:22:15.000000000 -0600
-+++ CVS2_6_12_PA2/include/asm-s390/compat.h 2004-10-10 15:23:29.000000000 -0600
+Index: linux-2.6-2.6.12/include/asm-s390/compat.h
+===================================================================
+--- linux-2.6-2.6.12.orig/include/asm-s390/compat.h 2005-08-09 09:52:27.000000000 -0400
++++ linux-2.6-2.6.12/include/asm-s390/compat.h 2005-08-09 17:53:35.000000000 -0400
@@ -15,6 +15,9 @@
typedef s32 compat_pid_t;
typedef u16 compat_uid_t;
@@ -6583,9 +6713,10 @@
typedef u32 compat_uid32_t;
typedef u32 compat_gid32_t;
typedef u16 compat_mode_t;
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/include/asm-sparc64/compat.h CVS2_6_12_PA2/include/asm-sparc64/compat.h
---- LINUS_2_6_12/include/asm-sparc64/compat.h 2005-06-17 21:22:15.000000000 -0600
-+++ CVS2_6_12_PA2/include/asm-sparc64/compat.h 2005-04-21 18:26:06.000000000 -0600
+Index: linux-2.6-2.6.12/include/asm-sparc64/compat.h
+===================================================================
+--- linux-2.6-2.6.12.orig/include/asm-sparc64/compat.h 2005-08-09 09:52:27.000000000 -0400
++++ linux-2.6-2.6.12/include/asm-sparc64/compat.h 2005-08-09 17:53:35.000000000 -0400
@@ -12,6 +12,9 @@
typedef s32 compat_time_t;
typedef s32 compat_clock_t;
@@ -6596,9 +6727,10 @@
typedef u16 compat_uid_t;
typedef u16 compat_gid_t;
typedef u16 compat_mode_t;
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/include/linux/compat.h CVS2_6_12_PA2/include/linux/compat.h
---- LINUS_2_6_12/include/linux/compat.h 2005-06-17 21:22:16.000000000 -0600
-+++ CVS2_6_12_PA2/include/linux/compat.h 2005-03-18 07:38:12.000000000 -0700
+Index: linux-2.6-2.6.12/include/linux/compat.h
+===================================================================
+--- linux-2.6-2.6.12.orig/include/linux/compat.h 2005-08-09 09:52:27.000000000 -0400
++++ linux-2.6-2.6.12/include/linux/compat.h 2005-08-09 17:53:35.000000000 -0400
@@ -6,10 +6,16 @@
*/
#include <linux/config.h>
@@ -6669,9 +6801,10 @@
#endif /* CONFIG_COMPAT */
#endif /* _LINUX_COMPAT_H */
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/include/linux/compat_siginfo.h CVS2_6_12_PA2/include/linux/compat_siginfo.h
---- LINUS_2_6_12/include/linux/compat_siginfo.h 1969-12-31 17:00:00.000000000 -0700
-+++ CVS2_6_12_PA2/include/linux/compat_siginfo.h 2005-03-18 07:38:12.000000000 -0700
+Index: linux-2.6-2.6.12/include/linux/compat_siginfo.h
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ linux-2.6-2.6.12/include/linux/compat_siginfo.h 2005-08-09 17:53:35.000000000 -0400
@@ -0,0 +1,181 @@
+#ifndef _ASM_GENERIC_COMPAT_SIGINFO_H
+#define _ASM_GENERIC_COMPAT_SIGINFO_H
@@ -6854,9 +6987,10 @@
+#endif /* CONFIG_COMPAT */
+#endif /* _ASM_GENERIC_COMPAT_SIGINFO_H */
+
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/include/linux/hil.h CVS2_6_12_PA2/include/linux/hil.h
---- LINUS_2_6_12/include/linux/hil.h 1969-12-31 17:00:00.000000000 -0700
-+++ CVS2_6_12_PA2/include/linux/hil.h 2004-10-31 14:05:59.000000000 -0700
+Index: linux-2.6-2.6.12/include/linux/hil.h
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ linux-2.6-2.6.12/include/linux/hil.h 2005-08-09 17:53:35.000000000 -0400
@@ -0,0 +1,483 @@
+#ifndef _HIL_H_
+#define _HIL_H_
@@ -7341,9 +7475,10 @@
+
+
+#endif /* _HIL_H_ */
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/include/linux/hil_mlc.h CVS2_6_12_PA2/include/linux/hil_mlc.h
---- LINUS_2_6_12/include/linux/hil_mlc.h 1969-12-31 17:00:00.000000000 -0700
-+++ CVS2_6_12_PA2/include/linux/hil_mlc.h 2004-10-30 13:51:51.000000000 -0600
+Index: linux-2.6-2.6.12/include/linux/hil_mlc.h
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ linux-2.6-2.6.12/include/linux/hil_mlc.h 2005-08-09 17:53:35.000000000 -0400
@@ -0,0 +1,168 @@
+/*
+ * HP Human Interface Loop Master Link Controller driver.
@@ -7513,9 +7648,10 @@
+
+int hil_mlc_register(hil_mlc *mlc);
+int hil_mlc_unregister(hil_mlc *mlc);
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/include/linux/hp_sdc.h CVS2_6_12_PA2/include/linux/hp_sdc.h
---- LINUS_2_6_12/include/linux/hp_sdc.h 1969-12-31 17:00:00.000000000 -0700
-+++ CVS2_6_12_PA2/include/linux/hp_sdc.h 2004-07-11 16:03:48.000000000 -0600
+Index: linux-2.6-2.6.12/include/linux/hp_sdc.h
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ linux-2.6-2.6.12/include/linux/hp_sdc.h 2005-08-09 17:53:35.000000000 -0400
@@ -0,0 +1,300 @@
+/*
+ * HP i8042 System Device Controller -- header
@@ -7817,9 +7953,10 @@
+} hp_i8042_sdc;
+
+#endif /* _LINUX_HP_SDC_H */
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/include/linux/input.h CVS2_6_12_PA2/include/linux/input.h
---- LINUS_2_6_12/include/linux/input.h 2005-06-17 21:22:16.000000000 -0600
-+++ CVS2_6_12_PA2/include/linux/input.h 2005-05-08 20:00:58.000000000 -0600
+Index: linux-2.6-2.6.12/include/linux/input.h
+===================================================================
+--- linux-2.6-2.6.12.orig/include/linux/input.h 2005-08-09 09:52:27.000000000 -0400
++++ linux-2.6-2.6.12/include/linux/input.h 2005-08-09 17:53:35.000000000 -0400
@@ -620,6 +620,7 @@
#define BUS_ADB 0x17
#define BUS_I2C 0x18
@@ -7828,9 +7965,10 @@
/*
* Values describing the status of an effect
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/include/linux/serio.h CVS2_6_12_PA2/include/linux/serio.h
---- LINUS_2_6_12/include/linux/serio.h 2005-06-17 21:22:16.000000000 -0600
-+++ CVS2_6_12_PA2/include/linux/serio.h 2005-03-25 21:59:49.000000000 -0700
+Index: linux-2.6-2.6.12/include/linux/serio.h
+===================================================================
+--- linux-2.6-2.6.12.orig/include/linux/serio.h 2005-08-09 09:52:27.000000000 -0400
++++ linux-2.6-2.6.12/include/linux/serio.h 2005-08-09 17:53:35.000000000 -0400
@@ -179,7 +179,7 @@
#define SERIO_8042_XL 0x06
@@ -7840,9 +7978,10 @@
*/
#define SERIO_UNKNOWN 0x00
#define SERIO_MSC 0x01
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/include/linux/signal.h CVS2_6_12_PA2/include/linux/signal.h
---- LINUS_2_6_12/include/linux/signal.h 2005-06-17 21:22:16.000000000 -0600
-+++ CVS2_6_12_PA2/include/linux/signal.h 2005-06-17 21:32:55.000000000 -0600
+Index: linux-2.6-2.6.12/include/linux/signal.h
+===================================================================
+--- linux-2.6-2.6.12.orig/include/linux/signal.h 2005-08-09 09:52:27.000000000 -0400
++++ linux-2.6-2.6.12/include/linux/signal.h 2005-08-09 17:53:35.000000000 -0400
@@ -234,6 +234,9 @@
struct pt_regs;
extern int get_signal_to_deliver(siginfo_t *info, struct k_sigaction *return_ka, struct pt_regs *regs, void *cookie);
@@ -7853,9 +7992,10 @@
#endif /* __KERNEL__ */
#endif /* _LINUX_SIGNAL_H */
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/include/sound/opl3.h CVS2_6_12_PA2/include/sound/opl3.h
---- LINUS_2_6_12/include/sound/opl3.h 2005-06-17 21:22:17.000000000 -0600
-+++ CVS2_6_12_PA2/include/sound/opl3.h 2005-03-01 09:56:38.000000000 -0700
+Index: linux-2.6-2.6.12/include/sound/opl3.h
+===================================================================
+--- linux-2.6-2.6.12.orig/include/sound/opl3.h 2005-08-09 09:52:27.000000000 -0400
++++ linux-2.6-2.6.12/include/sound/opl3.h 2005-08-09 17:53:35.000000000 -0400
@@ -261,8 +261,8 @@
} snd_opl3_voice_t;
@@ -7877,9 +8017,10 @@
int snd_opl3_create(snd_card_t * card,
unsigned long l_port, unsigned long r_port,
unsigned short hardware,
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/ipc/compat_mq.c CVS2_6_12_PA2/ipc/compat_mq.c
---- LINUS_2_6_12/ipc/compat_mq.c 2005-06-17 21:22:17.000000000 -0600
-+++ CVS2_6_12_PA2/ipc/compat_mq.c 2005-03-18 06:17:54.000000000 -0700
+Index: linux-2.6-2.6.12/ipc/compat_mq.c
+===================================================================
+--- linux-2.6-2.6.12.orig/ipc/compat_mq.c 2005-08-09 09:52:27.000000000 -0400
++++ linux-2.6-2.6.12/ipc/compat_mq.c 2005-08-09 17:53:35.000000000 -0400
@@ -7,6 +7,7 @@
*/
@@ -7888,9 +8029,10 @@
#include <linux/fs.h>
#include <linux/kernel.h>
#include <linux/mqueue.h>
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/kernel/Makefile CVS2_6_12_PA2/kernel/Makefile
---- LINUS_2_6_12/kernel/Makefile 2005-06-17 21:22:18.000000000 -0600
-+++ CVS2_6_12_PA2/kernel/Makefile 2005-05-08 20:01:00.000000000 -0600
+Index: linux-2.6-2.6.12/kernel/Makefile
+===================================================================
+--- linux-2.6-2.6.12.orig/kernel/Makefile 2005-08-09 09:52:27.000000000 -0400
++++ linux-2.6-2.6.12/kernel/Makefile 2005-08-09 17:53:35.000000000 -0400
@@ -17,7 +17,7 @@
obj-$(CONFIG_KALLSYMS) += kallsyms.o
obj-$(CONFIG_PM) += power/
@@ -7900,9 +8042,10 @@
obj-$(CONFIG_CPUSETS) += cpuset.o
obj-$(CONFIG_IKCONFIG) += configs.o
obj-$(CONFIG_IKCONFIG_PROC) += configs.o
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/kernel/compat.c CVS2_6_12_PA2/kernel/compat.c
---- LINUS_2_6_12/kernel/compat.c 2005-06-17 21:22:18.000000000 -0600
-+++ CVS2_6_12_PA2/kernel/compat.c 2005-04-21 18:26:08.000000000 -0600
+Index: linux-2.6-2.6.12/kernel/compat.c
+===================================================================
+--- linux-2.6-2.6.12.orig/kernel/compat.c 2005-08-09 09:52:27.000000000 -0400
++++ linux-2.6-2.6.12/kernel/compat.c 2005-08-09 17:53:35.000000000 -0400
@@ -13,6 +13,7 @@
#include <linux/linkage.h>
@@ -7960,9 +8103,10 @@
ret = -EFAULT;
}
}else {
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/kernel/compat_signal.c CVS2_6_12_PA2/kernel/compat_signal.c
---- LINUS_2_6_12/kernel/compat_signal.c 1969-12-31 17:00:00.000000000 -0700
-+++ CVS2_6_12_PA2/kernel/compat_signal.c 2004-11-03 15:07:38.000000000 -0700
+Index: linux-2.6-2.6.12/kernel/compat_signal.c
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ linux-2.6-2.6.12/kernel/compat_signal.c 2005-08-09 17:53:35.000000000 -0400
@@ -0,0 +1,244 @@
+/*
+ * Copyright (C) 2003 Carlos O'Donell
@@ -8208,9 +8352,10 @@
+}
+#endif
+
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/kernel/posix-cpu-timers.c CVS2_6_12_PA2/kernel/posix-cpu-timers.c
---- LINUS_2_6_12/kernel/posix-cpu-timers.c 2005-06-17 21:22:18.000000000 -0600
-+++ CVS2_6_12_PA2/kernel/posix-cpu-timers.c 2005-04-04 14:47:32.000000000 -0600
+Index: linux-2.6-2.6.12/kernel/posix-cpu-timers.c
+===================================================================
+--- linux-2.6-2.6.12.orig/kernel/posix-cpu-timers.c 2005-08-09 09:52:27.000000000 -0400
++++ linux-2.6-2.6.12/kernel/posix-cpu-timers.c 2005-08-09 17:53:35.000000000 -0400
@@ -1270,8 +1270,6 @@
LIST_HEAD(firing);
struct k_itimer *timer, *next;
@@ -8220,9 +8365,10 @@
#define UNEXPIRED(clock) \
(cputime_eq(tsk->it_##clock##_expires, cputime_zero) || \
cputime_lt(clock##_ticks(tsk), tsk->it_##clock##_expires))
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/kernel/ptrace.c CVS2_6_12_PA2/kernel/ptrace.c
---- LINUS_2_6_12/kernel/ptrace.c 2005-06-17 21:22:18.000000000 -0600
-+++ CVS2_6_12_PA2/kernel/ptrace.c 2005-05-08 20:01:00.000000000 -0600
+Index: linux-2.6-2.6.12/kernel/ptrace.c
+===================================================================
+--- linux-2.6-2.6.12.orig/kernel/ptrace.c 2005-08-09 09:52:27.000000000 -0400
++++ linux-2.6-2.6.12/kernel/ptrace.c 2005-08-09 17:53:35.000000000 -0400
@@ -344,7 +344,7 @@
siginfo_t newinfo;
int error = -ESRCH;
@@ -8232,9 +8378,10 @@
return -EFAULT;
read_lock(&tasklist_lock);
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/kernel/resource.c CVS2_6_12_PA2/kernel/resource.c
---- LINUS_2_6_12/kernel/resource.c 2005-06-17 21:22:18.000000000 -0600
-+++ CVS2_6_12_PA2/kernel/resource.c 2005-04-21 18:26:08.000000000 -0600
+Index: linux-2.6-2.6.12/kernel/resource.c
+===================================================================
+--- linux-2.6-2.6.12.orig/kernel/resource.c 2005-08-09 09:52:27.000000000 -0400
++++ linux-2.6-2.6.12/kernel/resource.c 2005-08-09 17:53:35.000000000 -0400
@@ -181,6 +181,8 @@
{
struct resource *tmp, **p;
@@ -8244,9 +8391,10 @@
p = &old->parent->child;
for (;;) {
tmp = *p;
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/kernel/signal.c CVS2_6_12_PA2/kernel/signal.c
---- LINUS_2_6_12/kernel/signal.c 2005-06-17 21:22:18.000000000 -0600
-+++ CVS2_6_12_PA2/kernel/signal.c 2005-05-25 11:12:56.000000000 -0600
+Index: linux-2.6-2.6.12/kernel/signal.c
+===================================================================
+--- linux-2.6-2.6.12.orig/kernel/signal.c 2005-08-09 09:52:27.000000000 -0400
++++ linux-2.6-2.6.12/kernel/signal.c 2005-08-09 17:53:35.000000000 -0400
@@ -22,6 +22,7 @@
#include <linux/security.h>
#include <linux/syscalls.h>
@@ -8300,9 +8448,10 @@
return -EFAULT;
/* Not even root can pretend to send signals from the kernel.
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/kernel/sys.c CVS2_6_12_PA2/kernel/sys.c
---- LINUS_2_6_12/kernel/sys.c 2005-06-17 21:22:18.000000000 -0600
-+++ CVS2_6_12_PA2/kernel/sys.c 2005-05-19 18:05:13.000000000 -0600
+Index: linux-2.6-2.6.12/kernel/sys.c
+===================================================================
+--- linux-2.6-2.6.12.orig/kernel/sys.c 2005-08-09 09:52:27.000000000 -0400
++++ linux-2.6-2.6.12/kernel/sys.c 2005-08-09 17:53:35.000000000 -0400
@@ -30,6 +30,7 @@
#include <linux/compat.h>
#include <linux/syscalls.h>
@@ -8311,9 +8460,10 @@
#include <asm/uaccess.h>
#include <asm/io.h>
#include <asm/unistd.h>
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/mm/shmem.c CVS2_6_12_PA2/mm/shmem.c
---- LINUS_2_6_12/mm/shmem.c 2005-06-17 21:22:18.000000000 -0600
-+++ CVS2_6_12_PA2/mm/shmem.c 2005-04-04 14:47:34.000000000 -0600
+Index: linux-2.6-2.6.12/mm/shmem.c
+===================================================================
+--- linux-2.6-2.6.12.orig/mm/shmem.c 2005-08-09 09:52:27.000000000 -0400
++++ linux-2.6-2.6.12/mm/shmem.c 2005-08-09 17:53:35.000000000 -0400
@@ -461,7 +461,7 @@
} while (next);
}
@@ -8323,9 +8473,10 @@
{
struct shmem_inode_info *info = SHMEM_I(inode);
unsigned long idx;
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/sound/drivers/opl3/opl3_lib.c CVS2_6_12_PA2/sound/drivers/opl3/opl3_lib.c
---- LINUS_2_6_12/sound/drivers/opl3/opl3_lib.c 2005-06-17 21:22:20.000000000 -0600
-+++ CVS2_6_12_PA2/sound/drivers/opl3/opl3_lib.c 2005-03-01 09:56:38.000000000 -0700
+Index: linux-2.6-2.6.12/sound/drivers/opl3/opl3_lib.c
+===================================================================
+--- linux-2.6-2.6.12.orig/sound/drivers/opl3/opl3_lib.c 2005-08-09 09:52:27.000000000 -0400
++++ linux-2.6-2.6.12/sound/drivers/opl3/opl3_lib.c 2005-08-09 17:53:35.000000000 -0400
@@ -40,7 +40,7 @@
static void snd_opl2_command(opl3_t * opl3, unsigned short cmd, unsigned char val)
{
@@ -8534,9 +8685,10 @@
EXPORT_SYMBOL(snd_opl3_timer_new);
EXPORT_SYMBOL(snd_opl3_hwdep_new);
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/sound/oss/ad1889.c CVS2_6_12_PA2/sound/oss/ad1889.c
---- LINUS_2_6_12/sound/oss/ad1889.c 2005-06-17 21:22:21.000000000 -0600
-+++ CVS2_6_12_PA2/sound/oss/ad1889.c 2005-03-01 16:00:56.000000000 -0700
+Index: linux-2.6-2.6.12/sound/oss/ad1889.c
+===================================================================
+--- linux-2.6-2.6.12.orig/sound/oss/ad1889.c 2005-08-09 09:52:27.000000000 -0400
++++ linux-2.6-2.6.12/sound/oss/ad1889.c 2005-08-09 17:53:35.000000000 -0400
@@ -74,7 +74,7 @@
DBG("Setting WAV rate to %d\n", rate);
@@ -8928,9 +9080,10 @@
if (!dev->regbase) {
printk(KERN_ERR DEVNAME ": unable to remap iomem\n");
goto out2;
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/sound/oss/ad1889.h CVS2_6_12_PA2/sound/oss/ad1889.h
---- LINUS_2_6_12/sound/oss/ad1889.h 2005-06-17 21:22:21.000000000 -0600
-+++ CVS2_6_12_PA2/sound/oss/ad1889.h 2005-03-01 16:00:56.000000000 -0700
+Index: linux-2.6-2.6.12/sound/oss/ad1889.h
+===================================================================
+--- linux-2.6-2.6.12.orig/sound/oss/ad1889.h 2005-08-09 09:52:27.000000000 -0400
++++ linux-2.6-2.6.12/sound/oss/ad1889.h 2005-08-09 17:53:36.000000000 -0400
@@ -1,57 +1,58 @@
#ifndef _AD1889_H_
#define _AD1889_H_
@@ -9050,9 +9203,10 @@
#define AD_WAV_STATE 0
#define AD_ADC_STATE 1
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/sound/parisc/harmony.c CVS2_6_12_PA2/sound/parisc/harmony.c
---- LINUS_2_6_12/sound/parisc/harmony.c 2005-06-17 21:22:21.000000000 -0600
-+++ CVS2_6_12_PA2/sound/parisc/harmony.c 2005-05-31 15:45:55.000000000 -0600
+Index: linux-2.6-2.6.12/sound/parisc/harmony.c
+===================================================================
+--- linux-2.6-2.6.12.orig/sound/parisc/harmony.c 2005-08-09 09:52:27.000000000 -0400
++++ linux-2.6-2.6.12/sound/parisc/harmony.c 2005-08-09 17:53:36.000000000 -0400
@@ -197,7 +197,7 @@
spin_unlock(&h->lock);
@@ -9244,9 +9398,10 @@
};
static void __init
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/sound/parisc/harmony.h CVS2_6_12_PA2/sound/parisc/harmony.h
---- LINUS_2_6_12/sound/parisc/harmony.h 2005-06-17 21:22:21.000000000 -0600
-+++ CVS2_6_12_PA2/sound/parisc/harmony.h 2005-05-31 15:45:55.000000000 -0600
+Index: linux-2.6-2.6.12/sound/parisc/harmony.h
+===================================================================
+--- linux-2.6-2.6.12.orig/sound/parisc/harmony.h 2005-08-09 09:52:27.000000000 -0400
++++ linux-2.6-2.6.12/sound/parisc/harmony.h 2005-08-09 17:53:36.000000000 -0400
@@ -61,7 +61,7 @@
#define HARMONY_SIZE 64
@@ -9294,9 +9449,10 @@
#define HARMONY_GAIN_OUT 0x3f
#define HARMONY_GAIN_LO_SHIFT 6
#define HARMONY_GAIN_LO_MASK (HARMONY_GAIN_OUT << HARMONY_GAIN_LO_SHIFT)
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/sound/pci/Kconfig CVS2_6_12_PA2/sound/pci/Kconfig
---- LINUS_2_6_12/sound/pci/Kconfig 2005-06-17 21:22:21.000000000 -0600
-+++ CVS2_6_12_PA2/sound/pci/Kconfig 2005-04-18 19:56:30.000000000 -0600
+Index: linux-2.6-2.6.12/sound/pci/Kconfig
+===================================================================
+--- linux-2.6-2.6.12.orig/sound/pci/Kconfig 2005-08-09 09:52:27.000000000 -0400
++++ linux-2.6-2.6.12/sound/pci/Kconfig 2005-08-09 17:53:36.000000000 -0400
@@ -21,6 +21,26 @@
To compile this driver as a module, choose M here: the module
will be called snd-ali5451.
@@ -9324,9 +9480,10 @@
config SND_ATIIXP
tristate "ATI IXP AC97 Controller"
depends on SND
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/sound/pci/Makefile CVS2_6_12_PA2/sound/pci/Makefile
---- LINUS_2_6_12/sound/pci/Makefile 2005-06-17 21:22:21.000000000 -0600
-+++ CVS2_6_12_PA2/sound/pci/Makefile 2005-03-18 06:18:13.000000000 -0700
+Index: linux-2.6-2.6.12/sound/pci/Makefile
+===================================================================
+--- linux-2.6-2.6.12.orig/sound/pci/Makefile 2005-08-09 09:52:27.000000000 -0400
++++ linux-2.6-2.6.12/sound/pci/Makefile 2005-08-09 17:53:36.000000000 -0400
@@ -4,6 +4,7 @@
#
@@ -9343,10 +9500,11 @@
obj-$(CONFIG_SND_ATIIXP) += snd-atiixp.o
obj-$(CONFIG_SND_ATIIXP_MODEM) += snd-atiixp-modem.o
obj-$(CONFIG_SND_AZT3328) += snd-azt3328.o
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/sound/pci/ad1889.c CVS2_6_12_PA2/sound/pci/ad1889.c
---- LINUS_2_6_12/sound/pci/ad1889.c 1969-12-31 17:00:00.000000000 -0700
-+++ CVS2_6_12_PA2/sound/pci/ad1889.c 2005-06-24 19:07:21.000000000 -0600
-@@ -0,0 +1,1209 @@
+Index: linux-2.6-2.6.12/sound/pci/ad1889.c
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ linux-2.6-2.6.12/sound/pci/ad1889.c 2005-08-09 17:53:36.000000000 -0400
+@@ -0,0 +1,1210 @@
+/* Analog Devices 1889 audio driver
+ *
+ * This is a driver for the AD1889 PCI audio chipset found
@@ -9362,7 +9520,7 @@
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
@@ -9370,16 +9528,11 @@
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * TODO:
-+ * Fix "clic" when loading/unloading driver
-+ * Native ALSA playback fixup (our fault?)
-+ * note: if one does "while :; do cat /proc/asound/AD1889/AD1889; done"
-+ * during native playback, one will be surprised...
-+ * Fix Ctrl-C bug (take care of CCS?)
-+ * Starting capture during playback glitches the latter, and vice-versa.
-+ * There seem to be some inter effects between playback/capture start/stop.
-+ * Maybe we could use finer grained locking (separate locks for pb/cap).
++ * Do we need to take care of CCS register?
++ * Maybe we could use finer grained locking (separate locks for pb/cap)?
++ * Wishlist:
+ * Control Interface (mixer) support
-+ * Better AC97 support?
++ * Better AC97 support (VSR...)?
+ * PM support
+ * MIDI support
+ * Game Port support
@@ -9406,14 +9559,15 @@
+#include <asm/io.h>
+
+#include "ad1889.h"
++#include "ac97/ac97_id.h"
+
-+#define AD1889_DRVVER "$Revision: 1.21 $"
++#define AD1889_DRVVER "$Revision: 1.31 $"
+
+MODULE_AUTHOR("Kyle McMartin <kyle at parisc-linux.org>, Thibaut Varene <t-bone at parisc-linux.org>");
+MODULE_DESCRIPTION("Analog Devices AD1889 ALSA sound driver");
+MODULE_LICENSE("GPL");
+MODULE_VERSION(AD1889_DRVVER);
-+MODULE_SUPPORTED_DEVICE("{{Analog Devices,AD1889}"); /* XXX */
++MODULE_SUPPORTED_DEVICE("{{Analog Devices,AD1889}}");
+
+static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;
+module_param_array(index, int, NULL, 0444);
@@ -9432,7 +9586,7 @@
+MODULE_PARM_DESC(ac97_quirk, "AC'97 workaround for strange hardware.");
+
+#define DEVNAME "ad1889"
-+#define PFX DEVNAME ": "
++#define PFX DEVNAME ": "
+
+/* let's use the global sound debug interfaces */
+#define ad1889_debug(fmt, arg...) snd_printd(KERN_DEBUG fmt, ## arg)
@@ -9442,9 +9596,9 @@
+ u16 reg; /* reg setup */
+ u32 addr; /* dma base address */
+ u16 rate; /* sample rate */
-+ unsigned long pos; /* last recorded buffer position */
-+ unsigned long buf; /* buffer # */
-+ unsigned long size; /* buffer size */
++ unsigned long pos; /* last recorded DMA buffer position */
++ unsigned long buf; /* period # */
++ unsigned long size; /* DMA buffer size */
+ unsigned long count; /* period size, aka nb bytes sent in the current DMA transfer */
+};
+
@@ -9540,13 +9694,6 @@
+}
+
+static inline void
-+ad1889_load_adc_address(struct snd_ad1889 *chip, u32 addr)
-+{
-+ ad1889_writel(chip, AD_DMA_ADCBA, addr);
-+ ad1889_writel(chip, AD_DMA_ADCCA, addr);
-+}
-+
-+static inline void
+ad1889_load_wave_count(struct snd_ad1889 *chip, u32 count)
+{
+ ad1889_writel(chip, AD_DMA_WAVBC, count);
@@ -9555,13 +9702,6 @@
+ ad1889_writel(chip, AD_DMA_WAVIC, count);
+}
+
-+static inline void
-+ad1889_load_wave_address(struct snd_ad1889 *chip, u32 addr)
-+{
-+ ad1889_writel(chip, AD_DMA_WAVBA, addr);
-+ ad1889_writel(chip, AD_DMA_WAVCA, addr);
-+}
-+
+static void
+ad1889_channel_reset(struct snd_ad1889 *chip, unsigned int channel)
+{
@@ -9571,6 +9711,7 @@
+ /* Disable wave channel */
+ reg = ad1889_readw(chip, AD_DS_WSMC) & ~AD_DS_WSMC_WAEN;
+ ad1889_writew(chip, AD_DS_WSMC, reg);
++ chip->wave.reg = reg;
+
+ /* disable IRQs */
+ reg = ad1889_readw(chip, AD_DMA_WAV);
@@ -9578,9 +9719,10 @@
+ reg &= ~AD_DMA_LOOP;
+ ad1889_writew(chip, AD_DMA_WAV, reg);
+
-+ /* clear IRQ counters */
++ /* clear IRQ and address counters and pointers */
+ ad1889_load_wave_count(chip, 0x0);
-+ ad1889_load_wave_address(chip, 0x0);
++ ad1889_writel(chip, AD_DMA_WAVBA, 0x0);
++ ad1889_writel(chip, AD_DMA_WAVCA, 0x0);
+
+ /* flush */
+ ad1889_readw(chip, AD_DMA_WAV);
@@ -9590,6 +9732,7 @@
+ /* Disable ADC channel */
+ reg = ad1889_readw(chip, AD_DS_RAMC) & ~AD_DS_RAMC_ADEN;
+ ad1889_writew(chip, AD_DS_RAMC, reg);
++ chip->ramc.reg = reg;
+
+ reg = ad1889_readw(chip, AD_DMA_ADC);
+ reg &= AD_DMA_IM_DIS;
@@ -9597,7 +9740,8 @@
+ ad1889_writew(chip, AD_DMA_ADC, reg);
+
+ ad1889_load_adc_count(chip, 0x0);
-+ ad1889_load_adc_address(chip, 0x0);
++ ad1889_writel(chip, AD_DMA_ADCBA, 0x0);
++ ad1889_writel(chip, AD_DMA_ADCCA, 0x0);
+
+ /* flush */
+ ad1889_readw(chip, AD_DMA_ADC);
@@ -9612,9 +9756,7 @@
+}
+
+static inline void
-+snd_ad1889_ac97_write(ac97_t *ac97,
-+ unsigned short reg,
-+ unsigned short val)
++snd_ad1889_ac97_write(ac97_t *ac97, unsigned short reg, unsigned short val)
+{
+ struct snd_ad1889 *chip = ac97->private_data;
+ ad1889_writew(chip, AD_AC97_BASE + reg, val);
@@ -9626,22 +9768,21 @@
+ int retry = 400; /* average needs 352 msec */
+
+ while (!(ad1889_readw(chip, AD_AC97_ACIC) & AD_AC97_ACIC_ACRDY)
-+ && --retry)
++ && --retry)
+ mdelay(1);
+ if (!retry) {
+ snd_printk(KERN_ERR PFX "[%s] Link is not ready.\n",
+ __FUNCTION__);
+ return -EIO;
+ }
-+ ad1889_debug("[%s] ready after %d ms\n", __FUNCTION__,
-+ 400 - retry);
++ ad1889_debug("[%s] ready after %d ms\n", __FUNCTION__, 400 - retry);
+
+ return 0;
+}
+
+static int
+snd_ad1889_hw_params(snd_pcm_substream_t *substream,
-+ snd_pcm_hw_params_t *hw_params)
++ snd_pcm_hw_params_t *hw_params)
+{
+ return snd_pcm_lib_malloc_pages(substream,
+ params_buffer_bytes(hw_params));
@@ -9655,15 +9796,14 @@
+
+static snd_pcm_hardware_t snd_ad1889_playback_hw = {
+ .info = SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |
-+ SNDRV_PCM_INFO_MMAP_VALID |
-+ SNDRV_PCM_INFO_BLOCK_TRANSFER,
++ SNDRV_PCM_INFO_MMAP_VALID | SNDRV_PCM_INFO_BLOCK_TRANSFER,
+ .formats = SNDRV_PCM_FMTBIT_S16_LE,
+ .rates = SNDRV_PCM_RATE_CONTINUOUS | SNDRV_PCM_RATE_8000_48000,
-+ .rate_min = 8000, /* docs says 7000, but we're lazy */
++ .rate_min = 8000, /* docs say 7000, but we're lazy */
+ .rate_max = 48000,
+ .channels_min = 1,
+ .channels_max = 2,
-+ .buffer_bytes_max = DMA_SIZE, /* max buffer size in bytes */
++ .buffer_bytes_max = DMA_SIZE, /* max DMA buffer size in bytes */
+ .period_bytes_min = BUF_SIZE, /* min size of period in bytes */
+ .period_bytes_max = DMA_SIZE, /* max size of period in bytes */
+ .periods_min = 1, /* min nb of periods in buffer */
@@ -9673,15 +9813,14 @@
+
+static snd_pcm_hardware_t snd_ad1889_capture_hw = {
+ .info = SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |
-+ SNDRV_PCM_INFO_MMAP_VALID |
-+ SNDRV_PCM_INFO_BLOCK_TRANSFER,
++ SNDRV_PCM_INFO_MMAP_VALID | SNDRV_PCM_INFO_BLOCK_TRANSFER,
+ .formats = SNDRV_PCM_FMTBIT_S16_LE,
-+ .rates = SNDRV_PCM_RATE_CONTINUOUS | SNDRV_PCM_RATE_8000_48000,
-+ .rate_min = 8000, /* docs says 7000, but we're lazy */
++ .rates = SNDRV_PCM_RATE_48000,
++ .rate_min = 48000, /* docs say we could to VSR, but we're lazy */
+ .rate_max = 48000,
+ .channels_min = 1,
+ .channels_max = 2,
-+ .buffer_bytes_max = DMA_SIZE, /* max buffer size in bytes */
++ .buffer_bytes_max = DMA_SIZE, /* max DMA buffer size in bytes */
+ .period_bytes_min = BUF_SIZE, /* min size of period in bytes */
+ .period_bytes_max = DMA_SIZE, /* max size of period in bytes */
+ .periods_min = 1, /* min nb of periods in buffer */
@@ -9758,6 +9897,7 @@
+ chip->wave.count = count;
+ chip->wave.reg = reg;
+ chip->wave.buf = 0;
++ chip->wave.pos = 0;
+ chip->wave.rate = rt->rate;
+ chip->wave.addr = rt->dma_addr;
+
@@ -9766,8 +9906,11 @@
+ /* Set sample rates on the codec */
+ ad1889_writew(chip, AD_DS_WAS, chip->wave.rate);
+
-+ /* Set up DMA */
-+ ad1889_load_wave_address(chip, chip->wave.addr);
++ /* Set up DMA: first chunk address in curr addr, next one in base addr.
++ Base will be loaded into curr by the hardware upon interrupt
++ (as we use LOOP). Count holds the size of the chunk. */
++ ad1889_writel(chip, AD_DMA_WAVCA, chip->wave.addr);
++ ad1889_writel(chip, AD_DMA_WAVBA, chip->wave.addr + (count % size));
+ ad1889_load_wave_count(chip, chip->wave.count);
+
+ /* writes flush */
@@ -9775,9 +9918,9 @@
+
+ spin_unlock_irq(&chip->lock);
+
-+ ad1889_debug("prepare: chip->wave.addr = 0x%x, chip->wave.count = %u, "
-+ "chip->wave.size = %u\n", chip->wave.addr,
-+ count, size);
++ ad1889_debug("prepare playback: addr = 0x%x, count = %u, "
++ "size = %u, reg = 0x%x, rate = %u\n", chip->wave.addr,
++ count, size, reg, chip->wave.rate);
+ return 0;
+}
+
@@ -9810,13 +9953,17 @@
+ chip->ramc.count = count;
+ chip->ramc.reg = reg;
+ chip->ramc.buf = 0;
++ chip->ramc.pos = 0;
+ chip->ramc.rate = rt->rate;
+ chip->ramc.addr = rt->dma_addr;
+
+ ad1889_writew(chip, AD_DS_RAMC, chip->ramc.reg);
+
-+ /* Set up DMA */
-+ ad1889_load_adc_address(chip, chip->ramc.addr);
++ /* Set up DMA: first chunk address in curr addr, next one in base addr.
++ Base will be loaded into curr by the hardware upon interrupt
++ (as we use LOOP). Count holds the size of the chunk. */
++ ad1889_writel(chip, AD_DMA_ADCCA, chip->ramc.addr);
++ ad1889_writel(chip, AD_DMA_ADCBA, chip->ramc.addr + (count % size));
+ ad1889_load_adc_count(chip, chip->ramc.count);
+
+ /* writes flush */
@@ -9824,9 +9971,9 @@
+
+ spin_unlock_irq(&chip->lock);
+
-+ ad1889_debug("prepare: chip->ramc.addr = 0x%x, chip->ramc.count = %u, "
-+ "chip->ramc.size = %u\n", chip->ramc.addr,
-+ count, size);
++ ad1889_debug("prepare capture: addr = 0x%x, count = %u, "
++ "size = %u, reg = 0x%x, rate = %u\n", chip->ramc.addr,
++ count, size, reg, chip->ramc.rate);
+ return 0;
+}
+
@@ -9847,7 +9994,8 @@
+ /* enable DMA loop & interrupts */
+ ad1889_writew(chip, AD_DMA_WAV, AD_DMA_LOOP | AD_DMA_IM_CNT);
+ wsmc |= AD_DS_WSMC_WAEN;
-+ ad1889_writel(chip, AD_DMA_CHSS, AD_DMA_CHSS_WAVS); /* 1 to clear */
++ /* 1 to clear CHSS bit */
++ ad1889_writel(chip, AD_DMA_CHSS, AD_DMA_CHSS_WAVS);
+ ad1889_unmute(chip);
+ break;
+ case SNDRV_PCM_TRIGGER_STOP:
@@ -9871,7 +10019,9 @@
+}
+
+/* this is called in atomic context with IRQ disabled.
-+ Must be as fast as possible and not sleep */
++ Must be as fast as possible and not sleep.
++ DMA should be *triggered* by this call.
++ The RAMC "ADEN" bit triggers DMA ADC On/Off */
+static int
+snd_ad1889_capture_trigger(snd_pcm_substream_t *ss, int cmd)
+{
@@ -9885,7 +10035,8 @@
+ /* enable DMA loop & interrupts */
+ ad1889_writew(chip, AD_DMA_ADC, AD_DMA_LOOP | AD_DMA_IM_CNT);
+ ramc |= AD_DS_RAMC_ADEN;
-+ ad1889_writel(chip, AD_DMA_CHSS, AD_DMA_CHSS_ADCS); /* 1 to clear */
++ /* 1 to clear CHSS bit */
++ ad1889_writel(chip, AD_DMA_CHSS, AD_DMA_CHSS_ADCS);
+ break;
+ case SNDRV_PCM_TRIGGER_STOP:
+ ramc &= ~AD_DS_RAMC_ADEN;
@@ -9918,9 +10069,9 @@
+ ptr = ad1889_readl(chip, AD_DMA_WAVCA);
+ ptr -= chip->wave.addr;
+
-+ snd_assert((ptr > 0) && (ptr < chip->wave.size), return 0);
++ snd_assert((ptr >= 0) && (ptr < chip->wave.size), return 0);
+
-+ return bytes_to_frames(ss->runtime, ptr);
++ return bytes_to_frames(ss->runtime, ptr);
+}
+
+/* Called in atomic context with IRQ disabled */
@@ -9936,9 +10087,9 @@
+ ptr = ad1889_readl(chip, AD_DMA_ADCCA);
+ ptr -= chip->ramc.addr;
+
-+ snd_assert((ptr > 0) && (ptr < chip->ramc.size), return 0);
++ snd_assert((ptr >= 0) && (ptr < chip->ramc.size), return 0);
+
-+ return bytes_to_frames(ss->runtime, ptr);
++ return bytes_to_frames(ss->runtime, ptr);
+}
+
+static snd_pcm_ops_t snd_ad1889_playback_ops = {
@@ -9982,9 +10133,8 @@
+ if (unlikely(!st))
+ return IRQ_NONE;
+
-+ if (st & (AD_DMA_DISR_PMAI|AD_DMA_DISR_PTAI)) {
++ if (st & (AD_DMA_DISR_PMAI|AD_DMA_DISR_PTAI))
+ ad1889_debug("Unexpected master or target abort interrupt!\n");
-+ }
+
+ if (chip->pcm && (st & AD_DMA_DISR_WAVI) && chip->psubs) {
+ spin_lock(&chip->lock);
@@ -10017,10 +10167,10 @@
+ snd_pcm_period_elapsed(chip->psubs);
+#if 0
+ ad1889_debug("chip->wave.pos = %d, chip->wave.count = %d, "
-+ "chip->wave.size = %d\n", chip->wave.pos,
-+ chip->wave.count, chip->wave.size);
++ "chip->wave.size = %d\n", chip->wave.pos,
++ chip->wave.count, chip->wave.size);
+ ad1889_debug("chip->wave.addr (0x%lx) + next (0x%lx) = 0x%lx\n",
-+ chip->wave.addr, next, chip->wave.addr + next);
++ chip->wave.addr, next, chip->wave.addr + next);
+#endif
+ }
+
@@ -10055,14 +10205,14 @@
+ snd_pcm_period_elapsed(chip->csubs);
+#if 0
+ ad1889_debug("chip->ramc.pos = %d, chip->ramc.count = %d, "
-+ "chip->ramc.size = %d\n", chip->ramc.pos,
-+ chip->ramc.count, chip->ramc.size);
++ "chip->ramc.size = %d\n", chip->ramc.pos,
++ chip->ramc.count, chip->ramc.size);
+ ad1889_debug("chip->ramc.addr (0x%lx) + next (0x%lx) = 0x%lx\n",
-+ chip->ramc.addr, next, chip->ramc.addr + next);
++ chip->ramc.addr, next, chip->ramc.addr + next);
+#endif
+ }
+
-+ /* XXX under some circumstances the DISR flushing may not happen */
++ /* XXX under some circumstances the DISR write flush may not happen */
+
+ return IRQ_HANDLED;
+}
@@ -10144,9 +10294,17 @@
+ (reg & AD_DS_WSMC_WAST) ? "stereo" : "mono");
+
+
-+ snd_iprintf(buffer, "Synthesis output: %s\n\n",
++ snd_iprintf(buffer, "Synthesis output: %s\n",
+ reg & AD_DS_WSMC_SYEN ? "enabled" : "disabled");
+
++ /* SYRQ is at offset 4 */
++ tmp = (reg & AD_DS_WSMC_SYRQ) ?
++ (((reg & AD_DS_WSMC_SYRQ >> 4) & 0x01) ? 12 : 18) : 4;
++ tmp /= (reg & AD_DS_WSMC_WAST) ? 2 : 1;
++
++ snd_iprintf(buffer, "Synthesis FIFO: %d %s words\n\n", tmp,
++ (reg & AD_DS_WSMC_WAST) ? "stereo" : "mono");
++
+ reg = ad1889_readw(chip, AD_DS_RAMC);
+ snd_iprintf(buffer, "ADC input: %s\n",
+ (reg & AD_DS_RAMC_ADEN) ? "enabled" : "disabled");
@@ -10203,9 +10361,10 @@
+}
+
+static struct ac97_quirk ac97_quirks[] = {
-+ { /* FIXME: which codec? */
++ {
+ .vendor = 0x11d4, /* AD */
+ .device = 0x1889, /* AD1889 */
++ .codec_id = AC97_ID_AD1819,
+ .name = "AD1889",
+ .type = AC97_TUNE_HP_ONLY
+ },
@@ -10296,7 +10455,7 @@
+ /* Turn off interrupt on count and zero DMA registers */
+ ad1889_channel_reset(chip, AD_CHAN_WAV | AD_CHAN_ADC);
+
-+ /* clear DISR. If we don't, we'd better jump off the Eiffel Tower */
++ /* clear DISR. If we don't, we'd better jump off the Eiffel Tower */
+ ad1889_writel(chip, AD_DMA_DISR, AD_DMA_DISR_PTAI | AD_DMA_DISR_PMAI);
+ ad1889_readl(chip, AD_DMA_DISR); /* flush, dammit! */
+
@@ -10334,7 +10493,7 @@
+snd_ad1889_init(struct snd_ad1889 *chip)
+{
+ ad1889_writew(chip, AD_DS_CCS, AD_DS_CCS_CLKEN); /* turn on clock */
-+ ad1889_readw(chip, AD_DS_CCS); /* flush posted write */
++ ad1889_readw(chip, AD_DS_CCS); /* flush posted write */
+
+ mdelay(10);
+
@@ -10536,10 +10695,10 @@
+MODULE_DEVICE_TABLE(pci, snd_ad1889_ids);
+
+static struct pci_driver ad1889_pci = {
-+ .name = "AD1889 Audio",
-+ .id_table = snd_ad1889_ids,
-+ .probe = snd_ad1889_probe,
-+ .remove = __devexit_p(snd_ad1889_remove),
++ .name = "AD1889 Audio",
++ .id_table = snd_ad1889_ids,
++ .probe = snd_ad1889_probe,
++ .remove = __devexit_p(snd_ad1889_remove),
+};
+
+static int __init
@@ -10556,9 +10715,10 @@
+
+module_init(alsa_ad1889_init);
+module_exit(alsa_ad1889_fini);
-diff -urN --exclude-from=/var/www/download/linux-2.6/autobuild/build-tools/dontdiff LINUS_2_6_12/sound/pci/ad1889.h CVS2_6_12_PA2/sound/pci/ad1889.h
---- LINUS_2_6_12/sound/pci/ad1889.h 1969-12-31 17:00:00.000000000 -0700
-+++ CVS2_6_12_PA2/sound/pci/ad1889.h 2005-06-24 19:08:25.000000000 -0600
+Index: linux-2.6-2.6.12/sound/pci/ad1889.h
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ linux-2.6-2.6.12/sound/pci/ad1889.h 2005-08-09 17:53:36.000000000 -0400
@@ -0,0 +1,187 @@
+/* Analog Devices 1889 audio driver
+ * Copyright (C) 2004, Kyle McMartin <kyle at parisc-linux.org>
@@ -10644,7 +10804,7 @@
+#define AD_DMA_WAVIB 0x9c /* wave dma interrupt base byte count */
+
+#define AD_DMA_ICC 0xffffff /* current byte count mask */
-+#define AD_DMA_IBC 0xffffff /* base byte count mask */
++#define AD_DMA_IBC 0xffffff /* base byte count mask */
+/* bits 24 -> 31 reserved */
+
+/* 4 bytes pad */
@@ -10662,7 +10822,7 @@
+#define AD_DMA_IM_EOL 0x000c /* interrupt on End of Linked List */
+#define AD_DMA_SGDS 0x0030 /* SGD status */
+#define AD_DMA_SFLG 0x0040 /* SGD flag */
-+#define AD_DMA_EOL 0x0080 /* SGD end of list */
++#define AD_DMA_EOL 0x0080 /* SGD end of list */
+/* bits 8 -> 15 reserved */
+
+#define AD_DMA_DISR 0xc0 /* dma interrupt status */
Modified: people/waldi/kernel/source/linux-2.6/debian/templates/control.source.in
===================================================================
--- people/waldi/kernel/source/linux-2.6/debian/templates/control.source.in 2005-08-14 13:26:38 UTC (rev 3856)
+++ people/waldi/kernel/source/linux-2.6/debian/templates/control.source.in 2005-08-14 14:38:50 UTC (rev 3857)
@@ -4,5 +4,5 @@
Maintainer: Debian Kernel Team <debian-kernel at lists.debian.org>
Uploaders: Andres Salomon <dilinger at debian.org>, Bastian Blank <waldi at debian.org>
Standards-Version: 3.6.1.0
-Build-Depends: gcc (>= 4:4.0) [!sparc !alpha !m68k], gcc-3.3 [sparc alpha m68k], debhelper (>= 4.1.0), module-init-tools, dpkg-dev (>= 1.10.23), debianutils (>= 1.6), bzip2, console-tools [!s390], sparc-utils [sparc], kernel-package (>= 9.005)
+Build-Depends: gcc (>= 4:4.0) [!sparc !alpha !m68k], gcc-3.3 [sparc alpha m68k], binutils-hppa64 [hppa], gcc-4.0-hppa64 [hppa], debhelper (>= 4.1.0), module-init-tools, dpkg-dev (>= 1.10.23), debianutils (>= 1.6), bzip2, console-tools [!s390], sparc-utils [sparc], kernel-package (>= 9.005)
Build-Depends-Indep: docbook-utils, gs, transfig, xmlto, dh-kpatches (>= 0.99.3)
Modified: people/waldi/kernel/source/linux-2.6/debian/templates/post-install.in
===================================================================
--- people/waldi/kernel/source/linux-2.6/debian/templates/post-install.in 2005-08-14 13:26:38 UTC (rev 3856)
+++ people/waldi/kernel/source/linux-2.6/debian/templates/post-install.in 2005-08-14 14:38:50 UTC (rev 3857)
@@ -80,8 +80,7 @@
[ -f arch/$arch/kernel/asm-offsets.s ] && ln -f arch/$arch/kernel/asm-offsets.s $dir/arch/$arch/kernel
ln -s ../../../../linux-headers-$prefix/arch/$arch/kernel/Makefile $dir/arch/$arch/kernel
find include -mindepth 1 -maxdepth 1 \
- ! -name config -a ! -name linux -a \( \
- ! -name 'asm-*' -o -name asm-generic \) \
+ ! -name config -a ! -name linux -a ! -name 'asm-*' \
-printf "../../linux-headers-$prefix/%p\n" |
xargs ln -s --target-directory=$dir/include
cp -a include/config $dir/include
@@ -93,6 +92,18 @@
find include/asm-$arch -mindepth 1 -maxdepth 1 \
-type f -links 2 |
xargs ln -f --target-directory=$dir/include/asm-$arch
+for i in include/asm-*
+do
+ case ${i#include/asm-} in
+ $arch)
+ ;;
+ generic | @headers_dirs@)
+ ln -s ../../linux-headers-$prefix/$i $dir/$i
+ ;;
+ *)
+ ;;
+ esac
+done
find include/linux -mindepth 1 -maxdepth 1 \
! -name autoconf.h -a ! -name compile.h -a ! -name version.h \
-printf "../../../linux-headers-$prefix/%p\n" |
More information about the Kernel-svn-changes
mailing list