[kernel] r7375 - in dists/trunk/linux-2.6/debian: . arch arch/alpha arch/amd64 arch/arm arch/armeb arch/hppa arch/i386 arch/ia64 arch/m68k arch/mips arch/mipsel arch/powerpc arch/sparc

Frederik Schüler fs at costa.debian.org
Fri Sep 8 10:00:30 UTC 2006 

Author: fs
Date: Fri Sep  8 10:00:29 2006
New Revision: 7375

Modified:
   dists/trunk/linux-2.6/debian/arch/alpha/config
   dists/trunk/linux-2.6/debian/arch/amd64/config
   dists/trunk/linux-2.6/debian/arch/arm/config.footbridge
   dists/trunk/linux-2.6/debian/arch/arm/config.iop32x
   dists/trunk/linux-2.6/debian/arch/arm/config.ixp4xx
   dists/trunk/linux-2.6/debian/arch/arm/config.nslu2
   dists/trunk/linux-2.6/debian/arch/arm/config.rpc
   dists/trunk/linux-2.6/debian/arch/arm/config.s3c2410
   dists/trunk/linux-2.6/debian/arch/armeb/config.nslu2
   dists/trunk/linux-2.6/debian/arch/config
   dists/trunk/linux-2.6/debian/arch/hppa/config
   dists/trunk/linux-2.6/debian/arch/i386/config
   dists/trunk/linux-2.6/debian/arch/i386/defines
   dists/trunk/linux-2.6/debian/arch/ia64/config
   dists/trunk/linux-2.6/debian/arch/m68k/config
   dists/trunk/linux-2.6/debian/arch/m68k/config.amiga
   dists/trunk/linux-2.6/debian/arch/m68k/config.atari
   dists/trunk/linux-2.6/debian/arch/m68k/config.bvme6000
   dists/trunk/linux-2.6/debian/arch/m68k/config.hp
   dists/trunk/linux-2.6/debian/arch/m68k/config.mac
   dists/trunk/linux-2.6/debian/arch/m68k/config.mvme147
   dists/trunk/linux-2.6/debian/arch/m68k/config.mvme16x
   dists/trunk/linux-2.6/debian/arch/m68k/config.q40
   dists/trunk/linux-2.6/debian/arch/m68k/config.sun3
   dists/trunk/linux-2.6/debian/arch/mips/config.r4k-ip22
   dists/trunk/linux-2.6/debian/arch/mips/config.r5k-ip32
   dists/trunk/linux-2.6/debian/arch/mips/config.sb1-bcm91250a
   dists/trunk/linux-2.6/debian/arch/mips/config.sb1a-bcm91480b
   dists/trunk/linux-2.6/debian/arch/mipsel/config.r3k-kn02
   dists/trunk/linux-2.6/debian/arch/mipsel/config.r4k-kn04
   dists/trunk/linux-2.6/debian/arch/mipsel/config.r5k-cobalt
   dists/trunk/linux-2.6/debian/arch/mipsel/config.sb1-bcm91250a
   dists/trunk/linux-2.6/debian/arch/mipsel/config.sb1a-bcm91480b
   dists/trunk/linux-2.6/debian/arch/powerpc/config
   dists/trunk/linux-2.6/debian/arch/powerpc/config.apus
   dists/trunk/linux-2.6/debian/arch/sparc/config
   dists/trunk/linux-2.6/debian/arch/sparc/config.sparc32
   dists/trunk/linux-2.6/debian/arch/sparc/config.sparc64
   dists/trunk/linux-2.6/debian/arch/sparc/config.sparc64-smp
   dists/trunk/linux-2.6/debian/changelog

Log:
Deactivate EVBUG.
Make PARPORT options global.
Add class definition for 486 flavour.



Modified: dists/trunk/linux-2.6/debian/arch/alpha/config
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/alpha/config	(original)
+++ dists/trunk/linux-2.6/debian/arch/alpha/config	Fri Sep  8 10:00:29 2006
@@ -143,15 +143,6 @@
 CONFIG_MTD_NAND_IDS=m
 # CONFIG_MTD_NAND_DISKONCHIP is not set
 CONFIG_MTD_NAND_NANDSIM=y
-CONFIG_PARPORT=m
-CONFIG_PARPORT_PC=m
-CONFIG_PARPORT_SERIAL=m
-CONFIG_PARPORT_PC_FIFO=y
-CONFIG_PARPORT_PC_SUPERIO=y
-CONFIG_PARPORT_PC_PCMCIA=m
-CONFIG_PARPORT_NOT_PC=y
-# CONFIG_PARPORT_GSC is not set
-CONFIG_PARPORT_1284=y
 CONFIG_PNP=y
 # CONFIG_PNP_DEBUG is not set
 CONFIG_ISAPNP=y
@@ -816,7 +807,6 @@
 CONFIG_INPUT_TSDEV_SCREEN_X=240
 CONFIG_INPUT_TSDEV_SCREEN_Y=320
 CONFIG_INPUT_EVDEV=m
-CONFIG_INPUT_EVBUG=m
 CONFIG_INPUT_KEYBOARD=y
 CONFIG_KEYBOARD_ATKBD=y
 CONFIG_KEYBOARD_SUNKBD=m

Modified: dists/trunk/linux-2.6/debian/arch/amd64/config
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/amd64/config	(original)
+++ dists/trunk/linux-2.6/debian/arch/amd64/config	Fri Sep  8 10:00:29 2006
@@ -175,15 +175,6 @@
 CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADDRESS=0
 # CONFIG_MTD_NAND_DISKONCHIP_BBTWRITE is not set
 # CONFIG_MTD_NAND_NANDSIM is not set
-CONFIG_PARPORT=m
-CONFIG_PARPORT_PC=m
-CONFIG_PARPORT_SERIAL=m
-CONFIG_PARPORT_PC_FIFO=y
-# CONFIG_PARPORT_PC_SUPERIO is not set
-CONFIG_PARPORT_PC_PCMCIA=m
-CONFIG_PARPORT_NOT_PC=y
-# CONFIG_PARPORT_GSC is not set
-CONFIG_PARPORT_1284=y
 CONFIG_PNP=y
 CONFIG_PNP_DEBUG=y
 CONFIG_PNPACPI=y
@@ -729,7 +720,6 @@
 CONFIG_INPUT_TSDEV_SCREEN_X=240
 CONFIG_INPUT_TSDEV_SCREEN_Y=320
 CONFIG_INPUT_EVDEV=m
-CONFIG_INPUT_EVBUG=m
 CONFIG_INPUT_KEYBOARD=y
 CONFIG_KEYBOARD_ATKBD=y
 CONFIG_KEYBOARD_SUNKBD=m

Modified: dists/trunk/linux-2.6/debian/arch/arm/config.footbridge
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/arm/config.footbridge	(original)
+++ dists/trunk/linux-2.6/debian/arch/arm/config.footbridge	Fri Sep  8 10:00:29 2006
@@ -349,13 +349,7 @@
 #
 # Parallel port support
 #
-CONFIG_PARPORT=y
-CONFIG_PARPORT_PC=y
-CONFIG_PARPORT_PC_FIFO=y
-# CONFIG_PARPORT_PC_SUPERIO is not set
 # CONFIG_PARPORT_ARC is not set
-# CONFIG_PARPORT_GSC is not set
-CONFIG_PARPORT_1284=y
 
 #
 # Plug and Play support
@@ -769,7 +763,6 @@
 # CONFIG_INPUT_JOYDEV is not set
 # CONFIG_INPUT_TSDEV is not set
 CONFIG_INPUT_EVDEV=m
-# CONFIG_INPUT_EVBUG is not set
 
 #
 # Input Device Drivers
@@ -1770,7 +1763,6 @@
 CONFIG_BLK_DEV_CS5520=m
 CONFIG_USB_SISUSBVGA=m
 CONFIG_PCMCIA_FMVJ18X=m
-CONFIG_PARPORT_NOT_PC=y
 # CONFIG_SMP is not set
 # CONFIG_8139_OLD_RX_RESET is not set
 CONFIG_IEEE1394_CONFIG_ROM_IP1394=y
@@ -1790,7 +1782,6 @@
 # CONFIG_NCPFS_PACKET_SIGNING is not set
 # CONFIG_BLK_DEV_AMD74XX is not set
 # CONFIG_PDC202XX_BURST is not set
-# CONFIG_PARPORT_PC_PCMCIA is not set
 # CONFIG_8139TOO_PIO is not set
 # CONFIG_HPT34X_AUTODMA is not set
 CONFIG_AIRO=m
@@ -1851,7 +1842,6 @@
 # CONFIG_NET_CLS_ROUTE is not set
 CONFIG_VIDEO_TVEEPROM=m
 # CONFIG_USB_AUDIO is not set
-# CONFIG_PARPORT_SERIAL is not set
 CONFIG_VIDEO_IR=m
 CONFIG_VIDEO_TUNER=m
 # CONFIG_MEGARAID_MM is not set

Modified: dists/trunk/linux-2.6/debian/arch/arm/config.iop32x
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/arm/config.iop32x	(original)
+++ dists/trunk/linux-2.6/debian/arch/arm/config.iop32x	Fri Sep  8 10:00:29 2006
@@ -609,7 +609,6 @@
 #
 # Parallel port support
 #
-# CONFIG_PARPORT is not set
 
 #
 # Plug and Play support
@@ -982,7 +981,6 @@
 # CONFIG_INPUT_JOYDEV is not set
 # CONFIG_INPUT_TSDEV is not set
 CONFIG_INPUT_EVDEV=m
-# CONFIG_INPUT_EVBUG is not set
 
 #
 # Input Device Drivers

Modified: dists/trunk/linux-2.6/debian/arch/arm/config.ixp4xx
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/arm/config.ixp4xx	(original)
+++ dists/trunk/linux-2.6/debian/arch/arm/config.ixp4xx	Fri Sep  8 10:00:29 2006
@@ -650,7 +650,6 @@
 #
 # Parallel port support
 #
-# CONFIG_PARPORT is not set
 
 #
 # Plug and Play support
@@ -947,7 +946,6 @@
 # CONFIG_INPUT_JOYDEV is not set
 # CONFIG_INPUT_TSDEV is not set
 CONFIG_INPUT_EVDEV=m
-# CONFIG_INPUT_EVBUG is not set
 
 #
 # Input Device Drivers

Modified: dists/trunk/linux-2.6/debian/arch/arm/config.nslu2
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/arm/config.nslu2	(original)
+++ dists/trunk/linux-2.6/debian/arch/arm/config.nslu2	Fri Sep  8 10:00:29 2006
@@ -654,7 +654,6 @@
 #
 # Parallel port support
 #
-# CONFIG_PARPORT is not set
 
 #
 # Plug and Play support
@@ -951,7 +950,6 @@
 # CONFIG_INPUT_JOYDEV is not set
 # CONFIG_INPUT_TSDEV is not set
 CONFIG_INPUT_EVDEV=m
-# CONFIG_INPUT_EVBUG is not set
 
 #
 # Input Device Drivers

Modified: dists/trunk/linux-2.6/debian/arch/arm/config.rpc
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/arm/config.rpc	(original)
+++ dists/trunk/linux-2.6/debian/arch/arm/config.rpc	Fri Sep  8 10:00:29 2006
@@ -249,13 +249,7 @@
 #
 # Parallel port support
 #
-CONFIG_PARPORT=y
-CONFIG_PARPORT_PC=y
-CONFIG_PARPORT_PC_FIFO=y
-# CONFIG_PARPORT_PC_SUPERIO is not set
 # CONFIG_PARPORT_ARC is not set
-# CONFIG_PARPORT_GSC is not set
-# CONFIG_PARPORT_1284 is not set
 
 #
 # Plug and Play support
@@ -483,7 +477,6 @@
 # CONFIG_INPUT_JOYDEV is not set
 # CONFIG_INPUT_TSDEV is not set
 CONFIG_INPUT_EVDEV=m
-# CONFIG_INPUT_EVBUG is not set
 
 #
 # Input Device Drivers

Modified: dists/trunk/linux-2.6/debian/arch/arm/config.s3c2410
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/arm/config.s3c2410	(original)
+++ dists/trunk/linux-2.6/debian/arch/arm/config.s3c2410	Fri Sep  8 10:00:29 2006
@@ -369,11 +369,7 @@
 #
 # Parallel port support
 #
-CONFIG_PARPORT=y
-# CONFIG_PARPORT_PC is not set
 # CONFIG_PARPORT_ARC is not set
-# CONFIG_PARPORT_GSC is not set
-CONFIG_PARPORT_1284=y
 
 #
 # Plug and Play support
@@ -571,7 +567,6 @@
 # CONFIG_INPUT_JOYDEV is not set
 # CONFIG_INPUT_TSDEV is not set
 CONFIG_INPUT_EVDEV=m
-# CONFIG_INPUT_EVBUG is not set
 
 #
 # Input Device Drivers
@@ -1168,7 +1163,6 @@
 # CONFIG_USB_MOUSE is not set
 # CONFIG_USB_GADGET_NET2280 is not set
 CONFIG_USB_SERIAL_MCT_U232=m
-CONFIG_PARPORT_NOT_PC=y
 # CONFIG_ACORN_PARTITION_CUMANA is not set
 CONFIG_USB_SERIAL_TI=m
 CONFIG_USB_STORAGE_JUMPSHOT=y

Modified: dists/trunk/linux-2.6/debian/arch/armeb/config.nslu2
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/armeb/config.nslu2	(original)
+++ dists/trunk/linux-2.6/debian/arch/armeb/config.nslu2	Fri Sep  8 10:00:29 2006
@@ -654,7 +654,6 @@
 #
 # Parallel port support
 #
-# CONFIG_PARPORT is not set
 
 #
 # Plug and Play support
@@ -951,7 +950,6 @@
 # CONFIG_INPUT_JOYDEV is not set
 # CONFIG_INPUT_TSDEV is not set
 CONFIG_INPUT_EVDEV=m
-# CONFIG_INPUT_EVBUG is not set
 
 #
 # Input Device Drivers

Modified: dists/trunk/linux-2.6/debian/arch/config
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/config	(original)
+++ dists/trunk/linux-2.6/debian/arch/config	Fri Sep  8 10:00:29 2006
@@ -1025,3 +1025,13 @@
 CONFIG_SERIAL_8250_PNP=y
 CONFIG_DEBUG_BUGVERBOSE=y
 # CONFIG_OSS_OBSOLETE_DRIVER is not set
+CONFIG_PARPORT=m
+CONFIG_PARPORT_SERIAL=m
+# CONFIG_PARPORT_GSC is not set
+CONFIG_PARPORT_PC_FIFO=y
+CONFIG_PARPORT_PC=m
+# CONFIG_PARPORT_PC_SUPERIO is not set
+CONFIG_PARPORT_NOT_PC=y
+CONFIG_PARPORT_PC_PCMCIA=m
+CONFIG_PARPORT_1284=y
+# CONFIG_INPUT_EVBUG is not set

Modified: dists/trunk/linux-2.6/debian/arch/hppa/config
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/hppa/config	(original)
+++ dists/trunk/linux-2.6/debian/arch/hppa/config	Fri Sep  8 10:00:29 2006
@@ -81,14 +81,6 @@
 CONFIG_PREVENT_FIRMWARE_BUILD=y
 # CONFIG_DEBUG_DRIVER is not set
 # CONFIG_MTD is not set
-CONFIG_PARPORT=m
-CONFIG_PARPORT_PC=m
-# CONFIG_PARPORT_SERIAL is not set
-# CONFIG_PARPORT_PC_FIFO is not set
-# CONFIG_PARPORT_PC_SUPERIO is not set
-CONFIG_PARPORT_PC_PCMCIA=m
-CONFIG_PARPORT_GSC=y
-# CONFIG_PARPORT_1284 is not set
 # CONFIG_PNP is not set
 # CONFIG_BLK_DEV_FD is not set
 # CONFIG_BLK_DEV_XD is not set
@@ -460,7 +452,6 @@
 # CONFIG_INPUT_JOYDEV is not set
 # CONFIG_INPUT_TSDEV is not set
 CONFIG_INPUT_EVDEV=m
-# CONFIG_INPUT_EVBUG is not set
 CONFIG_INPUT_KEYBOARD=y
 CONFIG_KEYBOARD_ATKBD=y
 CONFIG_KEYBOARD_ATKBD_HP_KEYCODES=y
@@ -802,7 +793,6 @@
 CONFIG_FLATMEM_MANUAL=y
 # CONFIG_SPARSEMEM_MANUAL is not set
 CONFIG_MEGARAID_MM=m
-CONFIG_PARPORT_NOT_PC=y
 CONFIG_MEGARAID_MAILBOX=m
 # CONFIG_DISCONTIGMEM_MANUAL is not set
 CONFIG_SPLIT_PTLOCK_CPUS=4096

Modified: dists/trunk/linux-2.6/debian/arch/i386/config
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/i386/config	(original)
+++ dists/trunk/linux-2.6/debian/arch/i386/config	Fri Sep  8 10:00:29 2006
@@ -231,15 +231,6 @@
 CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADDRESS=0
 # CONFIG_MTD_NAND_DISKONCHIP_BBTWRITE is not set
 # CONFIG_MTD_NAND_NANDSIM is not set
-CONFIG_PARPORT=m
-CONFIG_PARPORT_PC=m
-CONFIG_PARPORT_SERIAL=m
-CONFIG_PARPORT_PC_FIFO=y
-# CONFIG_PARPORT_PC_SUPERIO is not set
-CONFIG_PARPORT_PC_PCMCIA=m
-CONFIG_PARPORT_NOT_PC=y
-# CONFIG_PARPORT_GSC is not set
-CONFIG_PARPORT_1284=y
 CONFIG_PNP=y
 # CONFIG_PNP_DEBUG is not set
 CONFIG_ISAPNP=y
@@ -887,7 +878,6 @@
 CONFIG_INPUT_TSDEV_SCREEN_X=240
 CONFIG_INPUT_TSDEV_SCREEN_Y=320
 CONFIG_INPUT_EVDEV=m
-CONFIG_INPUT_EVBUG=m
 CONFIG_INPUT_KEYBOARD=y
 CONFIG_KEYBOARD_ATKBD=y
 CONFIG_KEYBOARD_SUNKBD=m

Modified: dists/trunk/linux-2.6/debian/arch/i386/defines
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/i386/defines	(original)
+++ dists/trunk/linux-2.6/debian/arch/i386/defines	Fri Sep  8 10:00:29 2006
@@ -15,6 +15,10 @@
 conflicts: grub (<= 0.95+cvs20040624-17)
 suggests: grub (>= 0.97-3) | lilo (>= 19.1)
 
+[486]
+class: x86
+longclass: x86 and compatible
+
 [686]
 class: PPro/Celeron/PII/PIII/P4
 longclass: Pentium Pro/Celeron/Pentium II/Pentium III/Pentium 4

Modified: dists/trunk/linux-2.6/debian/arch/ia64/config
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/ia64/config	(original)
+++ dists/trunk/linux-2.6/debian/arch/ia64/config	Fri Sep  8 10:00:29 2006
@@ -156,15 +156,6 @@
 CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADDRESS=0
 # CONFIG_MTD_NAND_DISKONCHIP_BBTWRITE is not set
 # CONFIG_MTD_NAND_NANDSIM is not set
-CONFIG_PARPORT=m
-CONFIG_PARPORT_PC=m
-CONFIG_PARPORT_SERIAL=m
-# CONFIG_PARPORT_PC_FIFO is not set
-# CONFIG_PARPORT_PC_SUPERIO is not set
-CONFIG_PARPORT_PC_PCMCIA=m
-CONFIG_PARPORT_NOT_PC=y
-# CONFIG_PARPORT_GSC is not set
-CONFIG_PARPORT_1284=y
 CONFIG_PNP=y
 # CONFIG_PNP_DEBUG is not set
 CONFIG_PNPACPI=y
@@ -597,7 +588,6 @@
 CONFIG_INPUT_TSDEV_SCREEN_X=240
 CONFIG_INPUT_TSDEV_SCREEN_Y=320
 CONFIG_INPUT_EVDEV=m
-CONFIG_INPUT_EVBUG=m
 CONFIG_INPUT_KEYBOARD=y
 CONFIG_KEYBOARD_ATKBD=y
 CONFIG_KEYBOARD_SUNKBD=m

Modified: dists/trunk/linux-2.6/debian/arch/m68k/config
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/m68k/config	(original)
+++ dists/trunk/linux-2.6/debian/arch/m68k/config	Fri Sep  8 10:00:29 2006
@@ -127,7 +127,6 @@
 # CONFIG_INPUT_JOYDEV is not set
 # CONFIG_INPUT_TSDEV is not set
 CONFIG_INPUT_EVDEV=m
-# CONFIG_INPUT_EVBUG is not set
 CONFIG_INPUT_KEYBOARD=y
 # CONFIG_KEYBOARD_LKKBD is not set
 # CONFIG_KEYBOARD_XTKBD is not set

Modified: dists/trunk/linux-2.6/debian/arch/m68k/config.amiga
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/m68k/config.amiga	(original)
+++ dists/trunk/linux-2.6/debian/arch/m68k/config.amiga	Fri Sep  8 10:00:29 2006
@@ -23,13 +23,8 @@
 CONFIG_ISA=y
 CONFIG_GENERIC_ISA_DMA=y
 CONFIG_ZORRO_NAMES=y
-CONFIG_PARPORT=m
-# CONFIG_PARPORT_PC is not set
-CONFIG_PARPORT_NOT_PC=y
 CONFIG_PARPORT_AMIGA=m
 CONFIG_PARPORT_MFC3=m
-# CONFIG_PARPORT_GSC is not set
-CONFIG_PARPORT_1284=y
 # CONFIG_PNP is not set
 CONFIG_AMIGA_FLOPPY=y
 CONFIG_AMIGA_Z2RAM=y

Modified: dists/trunk/linux-2.6/debian/arch/m68k/config.atari
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/m68k/config.atari	(original)
+++ dists/trunk/linux-2.6/debian/arch/m68k/config.atari	Fri Sep  8 10:00:29 2006
@@ -18,12 +18,7 @@
 # CONFIG_M68KFPU_EMU_ONLY is not set
 CONFIG_STRAM_PROC=y
 CONFIG_HEARTBEAT=y
-CONFIG_PARPORT=m
-# CONFIG_PARPORT_PC is not set
-CONFIG_PARPORT_NOT_PC=y
 CONFIG_PARPORT_ATARI=m
-# CONFIG_PARPORT_GSC is not set
-CONFIG_PARPORT_1284=y
 CONFIG_ATARI_FLOPPY=y
 # CONFIG_PARIDE is not set
 CONFIG_IDE=y

Modified: dists/trunk/linux-2.6/debian/arch/m68k/config.bvme6000
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/m68k/config.bvme6000	(original)
+++ dists/trunk/linux-2.6/debian/arch/m68k/config.bvme6000	Fri Sep  8 10:00:29 2006
@@ -18,7 +18,6 @@
 CONFIG_M68060=y
 CONFIG_MMU_MOTOROLA=y
 # CONFIG_M68KFPU_EMU is not set
-# CONFIG_PARPORT is not set
 # CONFIG_IDE is not set
 CONFIG_BVME6000_SCSI=y
 # CONFIG_SCSI_NCR53C7xx_FAST is not set

Modified: dists/trunk/linux-2.6/debian/arch/m68k/config.hp
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/m68k/config.hp	(original)
+++ dists/trunk/linux-2.6/debian/arch/m68k/config.hp	Fri Sep  8 10:00:29 2006
@@ -18,7 +18,6 @@
 CONFIG_M68KFPU_EMU_EXTRAPREC=y
 # CONFIG_M68KFPU_EMU_ONLY is not set
 CONFIG_HEARTBEAT=y
-# CONFIG_PARPORT is not set
 # CONFIG_IDE is not set
 CONFIG_IP_PNP=y
 CONFIG_IP_PNP_DHCP=y

Modified: dists/trunk/linux-2.6/debian/arch/m68k/config.mac
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/m68k/config.mac	(original)
+++ dists/trunk/linux-2.6/debian/arch/m68k/config.mac	Fri Sep  8 10:00:29 2006
@@ -20,7 +20,6 @@
 CONFIG_M68KFPU_EMU_EXTRAPREC=y
 # CONFIG_M68KFPU_EMU_ONLY is not set
 # CONFIG_HEARTBEAT is not set
-# CONFIG_PARPORT is not set
 CONFIG_IDE=y
 CONFIG_BLK_DEV_IDE=y
 # CONFIG_BLK_DEV_IDE_SATA is not set

Modified: dists/trunk/linux-2.6/debian/arch/m68k/config.mvme147
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/m68k/config.mvme147	(original)
+++ dists/trunk/linux-2.6/debian/arch/m68k/config.mvme147	Fri Sep  8 10:00:29 2006
@@ -17,7 +17,6 @@
 # CONFIG_M68060 is not set
 CONFIG_MMU_MOTOROLA=y
 # CONFIG_M68KFPU_EMU is not set
-# CONFIG_PARPORT is not set
 # CONFIG_IDE is not set
 CONFIG_MVME147_SCSI=y
 CONFIG_IP_PNP=y

Modified: dists/trunk/linux-2.6/debian/arch/m68k/config.mvme16x
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/m68k/config.mvme16x	(original)
+++ dists/trunk/linux-2.6/debian/arch/m68k/config.mvme16x	Fri Sep  8 10:00:29 2006
@@ -18,7 +18,6 @@
 CONFIG_M68060=y
 CONFIG_MMU_MOTOROLA=y
 # CONFIG_M68KFPU_EMU is not set
-# CONFIG_PARPORT is not set
 # CONFIG_IDE is not set
 CONFIG_MVME16x_SCSI=y
 # CONFIG_SCSI_NCR53C7xx_FAST is not set

Modified: dists/trunk/linux-2.6/debian/arch/m68k/config.q40
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/m68k/config.q40	(original)
+++ dists/trunk/linux-2.6/debian/arch/m68k/config.q40	Fri Sep  8 10:00:29 2006
@@ -19,7 +19,6 @@
 # CONFIG_HEARTBEAT is not set
 CONFIG_ISA=y
 CONFIG_GENERIC_ISA_DMA=y
-# CONFIG_PARPORT is not set
 # CONFIG_PNP is not set
 # CONFIG_BLK_DEV_FD is not set
 CONFIG_IDE=y

Modified: dists/trunk/linux-2.6/debian/arch/m68k/config.sun3
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/m68k/config.sun3	(original)
+++ dists/trunk/linux-2.6/debian/arch/m68k/config.sun3	Fri Sep  8 10:00:29 2006
@@ -5,7 +5,6 @@
 CONFIG_M68KFPU_EMU=y
 CONFIG_M68KFPU_EMU_EXTRAPREC=y
 # CONFIG_M68KFPU_EMU_ONLY is not set
-# CONFIG_PARPORT is not set
 # CONFIG_IDE is not set
 CONFIG_IP_PNP=y
 CONFIG_IP_PNP_DHCP=y

Modified: dists/trunk/linux-2.6/debian/arch/mips/config.r4k-ip22
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/mips/config.r4k-ip22	(original)
+++ dists/trunk/linux-2.6/debian/arch/mips/config.r4k-ip22	Fri Sep  8 10:00:29 2006
@@ -520,10 +520,6 @@
 #
 # Parallel port support
 #
-CONFIG_PARPORT=m
-# CONFIG_PARPORT_PC is not set
-# CONFIG_PARPORT_GSC is not set
-CONFIG_PARPORT_1284=y
 
 #
 # Plug and Play support
@@ -752,7 +748,6 @@
 # CONFIG_INPUT_JOYDEV is not set
 # CONFIG_INPUT_TSDEV is not set
 CONFIG_INPUT_EVDEV=m
-# CONFIG_INPUT_EVBUG is not set
 
 #
 # Input Device Drivers

Modified: dists/trunk/linux-2.6/debian/arch/mips/config.r5k-ip32
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/mips/config.r5k-ip32	(original)
+++ dists/trunk/linux-2.6/debian/arch/mips/config.r5k-ip32	Fri Sep  8 10:00:29 2006
@@ -521,12 +521,7 @@
 #
 # Parallel port support
 #
-CONFIG_PARPORT=m
-# CONFIG_PARPORT_PC is not set
-CONFIG_PARPORT_NOT_PC=y
 CONFIG_PARPORT_IP32=m
-# CONFIG_PARPORT_GSC is not set
-CONFIG_PARPORT_1284=y
 
 #
 # Plug and Play support
@@ -786,7 +781,6 @@
 # CONFIG_INPUT_JOYDEV is not set
 # CONFIG_INPUT_TSDEV is not set
 CONFIG_INPUT_EVDEV=m
-# CONFIG_INPUT_EVBUG is not set
 
 #
 # Input Device Drivers

Modified: dists/trunk/linux-2.6/debian/arch/mips/config.sb1-bcm91250a
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/mips/config.sb1-bcm91250a	(original)
+++ dists/trunk/linux-2.6/debian/arch/mips/config.sb1-bcm91250a	Fri Sep  8 10:00:29 2006
@@ -540,10 +540,6 @@
 #
 # Parallel port support
 #
-CONFIG_PARPORT=m
-# CONFIG_PARPORT_PC is not set
-# CONFIG_PARPORT_GSC is not set
-CONFIG_PARPORT_1284=y
 
 #
 # Plug and Play support
@@ -919,7 +915,6 @@
 # CONFIG_INPUT_JOYDEV is not set
 # CONFIG_INPUT_TSDEV is not set
 CONFIG_INPUT_EVDEV=m
-# CONFIG_INPUT_EVBUG is not set
 
 #
 # Input Device Drivers
@@ -1863,7 +1858,6 @@
 # CONFIG_USB_GADGET_OMAP is not set
 CONFIG_USB_GADGET_NET2280=y
 CONFIG_USB_ETH_RNDIS=y
-CONFIG_PARPORT_NOT_PC=y
 # CONFIG_USB_GADGET_DEBUG_FILES is not set
 CONFIG_SOUND_BT878=m
 CONFIG_VIDEO_BUF=m

Modified: dists/trunk/linux-2.6/debian/arch/mips/config.sb1a-bcm91480b
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/mips/config.sb1a-bcm91480b	(original)
+++ dists/trunk/linux-2.6/debian/arch/mips/config.sb1a-bcm91480b	Fri Sep  8 10:00:29 2006
@@ -536,10 +536,6 @@
 #
 # Parallel port support
 #
-CONFIG_PARPORT=m
-# CONFIG_PARPORT_PC is not set
-# CONFIG_PARPORT_GSC is not set
-CONFIG_PARPORT_1284=y
 
 #
 # Plug and Play support
@@ -915,7 +911,6 @@
 # CONFIG_INPUT_JOYDEV is not set
 # CONFIG_INPUT_TSDEV is not set
 CONFIG_INPUT_EVDEV=m
-# CONFIG_INPUT_EVBUG is not set
 
 #
 # Input Device Drivers

Modified: dists/trunk/linux-2.6/debian/arch/mipsel/config.r3k-kn02
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/mipsel/config.r3k-kn02	(original)
+++ dists/trunk/linux-2.6/debian/arch/mipsel/config.r3k-kn02	Fri Sep  8 10:00:29 2006
@@ -471,12 +471,6 @@
 #
 # Parallel port support
 #
-CONFIG_PARPORT=m
-CONFIG_PARPORT_PC=m
-CONFIG_PARPORT_PC_FIFO=y
-CONFIG_PARPORT_PC_SUPERIO=y
-# CONFIG_PARPORT_GSC is not set
-CONFIG_PARPORT_1284=y
 
 #
 # Plug and Play support
@@ -679,7 +673,6 @@
 # CONFIG_INPUT_JOYDEV is not set
 # CONFIG_INPUT_TSDEV is not set
 CONFIG_INPUT_EVDEV=m
-# CONFIG_INPUT_EVBUG is not set
 
 #
 # Input Device Drivers

Modified: dists/trunk/linux-2.6/debian/arch/mipsel/config.r4k-kn04
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/mipsel/config.r4k-kn04	(original)
+++ dists/trunk/linux-2.6/debian/arch/mipsel/config.r4k-kn04	Fri Sep  8 10:00:29 2006
@@ -473,12 +473,6 @@
 #
 # Parallel port support
 #
-CONFIG_PARPORT=m
-CONFIG_PARPORT_PC=m
-CONFIG_PARPORT_PC_FIFO=y
-CONFIG_PARPORT_PC_SUPERIO=y
-# CONFIG_PARPORT_GSC is not set
-CONFIG_PARPORT_1284=y
 
 #
 # Plug and Play support
@@ -681,7 +675,6 @@
 # CONFIG_INPUT_JOYDEV is not set
 # CONFIG_INPUT_TSDEV is not set
 CONFIG_INPUT_EVDEV=m
-# CONFIG_INPUT_EVBUG is not set
 
 #
 # Input Device Drivers

Modified: dists/trunk/linux-2.6/debian/arch/mipsel/config.r5k-cobalt
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/mipsel/config.r5k-cobalt	(original)
+++ dists/trunk/linux-2.6/debian/arch/mipsel/config.r5k-cobalt	Fri Sep  8 10:00:29 2006
@@ -468,13 +468,6 @@
 #
 # Parallel port support
 #
-CONFIG_PARPORT=m
-CONFIG_PARPORT_PC=m
-CONFIG_PARPORT_SERIAL=m
-CONFIG_PARPORT_PC_FIFO=y
-CONFIG_PARPORT_PC_SUPERIO=y
-# CONFIG_PARPORT_GSC is not set
-CONFIG_PARPORT_1284=y
 
 #
 # Plug and Play support
@@ -934,7 +927,6 @@
 # CONFIG_INPUT_JOYDEV is not set
 # CONFIG_INPUT_TSDEV is not set
 CONFIG_INPUT_EVDEV=m
-# CONFIG_INPUT_EVBUG is not set
 
 #
 # Input Device Drivers

Modified: dists/trunk/linux-2.6/debian/arch/mipsel/config.sb1-bcm91250a
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/mipsel/config.sb1-bcm91250a	(original)
+++ dists/trunk/linux-2.6/debian/arch/mipsel/config.sb1-bcm91250a	Fri Sep  8 10:00:29 2006
@@ -540,10 +540,6 @@
 #
 # Parallel port support
 #
-CONFIG_PARPORT=m
-# CONFIG_PARPORT_PC is not set
-# CONFIG_PARPORT_GSC is not set
-CONFIG_PARPORT_1284=y
 
 #
 # Plug and Play support
@@ -919,7 +915,6 @@
 # CONFIG_INPUT_JOYDEV is not set
 # CONFIG_INPUT_TSDEV is not set
 CONFIG_INPUT_EVDEV=m
-# CONFIG_INPUT_EVBUG is not set
 
 #
 # Input Device Drivers
@@ -1863,7 +1858,6 @@
 # CONFIG_USB_GADGET_OMAP is not set
 CONFIG_USB_GADGET_NET2280=y
 CONFIG_USB_ETH_RNDIS=y
-CONFIG_PARPORT_NOT_PC=y
 # CONFIG_USB_GADGET_DEBUG_FILES is not set
 CONFIG_SOUND_BT878=m
 CONFIG_VIDEO_BUF=m

Modified: dists/trunk/linux-2.6/debian/arch/mipsel/config.sb1a-bcm91480b
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/mipsel/config.sb1a-bcm91480b	(original)
+++ dists/trunk/linux-2.6/debian/arch/mipsel/config.sb1a-bcm91480b	Fri Sep  8 10:00:29 2006
@@ -536,10 +536,6 @@
 #
 # Parallel port support
 #
-CONFIG_PARPORT=m
-# CONFIG_PARPORT_PC is not set
-# CONFIG_PARPORT_GSC is not set
-CONFIG_PARPORT_1284=y
 
 #
 # Plug and Play support
@@ -915,7 +911,6 @@
 # CONFIG_INPUT_JOYDEV is not set
 # CONFIG_INPUT_TSDEV is not set
 CONFIG_INPUT_EVDEV=m
-# CONFIG_INPUT_EVBUG is not set
 
 #
 # Input Device Drivers

Modified: dists/trunk/linux-2.6/debian/arch/powerpc/config
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/powerpc/config	(original)
+++ dists/trunk/linux-2.6/debian/arch/powerpc/config	Fri Sep  8 10:00:29 2006
@@ -107,7 +107,6 @@
 CONFIG_BOOT_LOAD=0x00800000
 CONFIG_STANDALONE=y
 # CONFIG_MTD is not set
-# CONFIG_PARPORT is not set
 CONFIG_BLK_DEV_FD=m
 CONFIG_BLK_CPQ_DA=m
 CONFIG_BLK_CPQ_CISS_DA=m
@@ -595,7 +594,6 @@
 CONFIG_INPUT_TSDEV_SCREEN_X=240
 CONFIG_INPUT_TSDEV_SCREEN_Y=320
 CONFIG_INPUT_EVDEV=m
-CONFIG_INPUT_EVBUG=m
 CONFIG_INPUT_KEYBOARD=y
 CONFIG_KEYBOARD_ATKBD=m
 # CONFIG_KEYBOARD_SUNKBD is not set

Modified: dists/trunk/linux-2.6/debian/arch/powerpc/config.apus
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/powerpc/config.apus	(original)
+++ dists/trunk/linux-2.6/debian/arch/powerpc/config.apus	Fri Sep  8 10:00:29 2006
@@ -81,9 +81,7 @@
 CONFIG_BLK_DEV_GAYLE=y
 CONFIG_LOGO_LINUX_VGA16=y
 CONFIG_OKTAGON_SCSI=y
-CONFIG_PARPORT=m
 CONFIG_PARPORT_AMIGA=m
-CONFIG_PARPORT_NOT_PC=y
 CONFIG_PARTITION_ADVANCED=y
 CONFIG_PPC32=y
 CONFIG_PPC=y
@@ -109,11 +107,9 @@
 CONFIG_FB_AMIGA_OCS=y
 CONFIG_FB_AMIGA_ECS=y
 CONFIG_FB_FM2=y
-# CONFIG_PARPORT_PC is not set
 CONFIG_PROC_HARDWARE=y
 # CONFIG_IRPORT_SIR is not set
 CONFIG_PARPORT_MFC3=m
-CONFIG_PARPORT_1284=y
 CONFIG_PARIDE=n
 # CONFIG_SCSI_PPA is not set
 CONFIG_SCSI_IMM=m

Modified: dists/trunk/linux-2.6/debian/arch/sparc/config
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/sparc/config	(original)
+++ dists/trunk/linux-2.6/debian/arch/sparc/config	Fri Sep  8 10:00:29 2006
@@ -14,11 +14,7 @@
 # CONFIG_PCI_NAMES is not set
 CONFIG_SUN_OPENPROMFS=m
 CONFIG_UID16=y
-CONFIG_PARPORT=m
-CONFIG_PARPORT_NOT_PC=y
-# CONFIG_PARPORT_GSC is not set
 CONFIG_PARPORT_SUNBPP=m
-CONFIG_PARPORT_1284=y
 CONFIG_PRINTER=m
 CONFIG_FB=y
 CONFIG_FB_CFB_IMAGEBLIT=y
@@ -210,7 +206,6 @@
 # CONFIG_INPUT_JOYDEV is not set
 # CONFIG_INPUT_TSDEV is not set
 CONFIG_INPUT_EVDEV=m
-# CONFIG_INPUT_EVBUG is not set
 CONFIG_INPUT_KEYBOARD=y
 CONFIG_KEYBOARD_ATKBD=y
 CONFIG_KEYBOARD_SUNKBD=y
@@ -366,7 +361,6 @@
 CONFIG_DRM_RADEON=m
 CONFIG_DRM_MGA=m
 CONFIG_SND_ALI5451=m
-# CONFIG_PARPORT_PC_FIFO is not set
 CONFIG_FLATMEM_MANUAL=y
 # CONFIG_KPROBES is not set
 # CONFIG_SPARSEMEM_MANUAL is not set

Modified: dists/trunk/linux-2.6/debian/arch/sparc/config.sparc32
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/sparc/config.sparc32	(original)
+++ dists/trunk/linux-2.6/debian/arch/sparc/config.sparc32	Fri Sep  8 10:00:29 2006
@@ -305,11 +305,7 @@
 #
 # Parallel port support
 #
-CONFIG_PARPORT=m
-CONFIG_PARPORT_NOT_PC=y
-# CONFIG_PARPORT_GSC is not set
 CONFIG_PARPORT_SUNBPP=m
-CONFIG_PARPORT_1284=y
 
 #
 # Plug and Play support
@@ -571,7 +567,6 @@
 # CONFIG_INPUT_JOYDEV is not set
 # CONFIG_INPUT_TSDEV is not set
 CONFIG_INPUT_EVDEV=m
-# CONFIG_INPUT_EVBUG is not set
 
 #
 # Input Device Drivers

Modified: dists/trunk/linux-2.6/debian/arch/sparc/config.sparc64
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/sparc/config.sparc64	(original)
+++ dists/trunk/linux-2.6/debian/arch/sparc/config.sparc64	Fri Sep  8 10:00:29 2006
@@ -19,8 +19,6 @@
 CONFIG_BINFMT_ELF32=y
 # CONFIG_BINFMT_AOUT32 is not set
 CONFIG_SOLARIS_EMUL=m
-CONFIG_PARPORT_PC=m
-# CONFIG_PARPORT_PC_SUPERIO is not set
 CONFIG_ENVCTRL=m
 CONFIG_DISPLAY7SEG=m
 # CONFIG_CMDLINE_BOOL is not set

Modified: dists/trunk/linux-2.6/debian/arch/sparc/config.sparc64-smp
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/sparc/config.sparc64-smp	(original)
+++ dists/trunk/linux-2.6/debian/arch/sparc/config.sparc64-smp	Fri Sep  8 10:00:29 2006
@@ -23,8 +23,6 @@
 CONFIG_BINFMT_ELF32=y
 # CONFIG_BINFMT_AOUT32 is not set
 CONFIG_SOLARIS_EMUL=m
-CONFIG_PARPORT_PC=m
-# CONFIG_PARPORT_PC_SUPERIO is not set
 CONFIG_ENVCTRL=m
 CONFIG_DISPLAY7SEG=m
 # CONFIG_CMDLINE_BOOL is not set

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	(original)
+++ dists/trunk/linux-2.6/debian/changelog	Fri Sep  8 10:00:29 2006
@@ -9,7 +9,13 @@
   [ Sven Luther ]
   * [powerpc] Enabled the -prep flavour.
 
- -- Sven Luther <sven at tael.powerlinux.fr>  Thu,  7 Sep 2006 11:59:26 +0200
+  [ Frederik Schüler ]
+  * Remove obsolete options from amd64 and i386 configs.
+  * Deactivate EVBUG.
+  * Make PARPORT options global.
+  * [i386] Add class definition for 486 flavour.
+
+ -- Frederik Schüler <fs at debian.org>  Fri,  8 Sep 2006 11:50:43 +0200
 
 linux-2.6 (2.6.17+2.6.18-rc6-0experimental.1) UNRELEASED; urgency=low

More information about the Kernel-svn-changes mailing list