diff --git a/debian/arch/alpha/config b/debian/arch/alpha/config index 37953143c..95ddaee63 100644 --- a/debian/arch/alpha/config +++ b/debian/arch/alpha/config @@ -143,15 +143,6 @@ CONFIG_MTD_NAND=m 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=m 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 diff --git a/debian/arch/amd64/config b/debian/arch/amd64/config index de6360c9f..67d92d8d2 100644 --- a/debian/arch/amd64/config +++ b/debian/arch/amd64/config @@ -175,15 +175,6 @@ CONFIG_MTD_NAND_DISKONCHIP=m 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=m 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 diff --git a/debian/arch/arm/config.footbridge b/debian/arch/arm/config.footbridge index 468c9ef90..46ab51a1f 100644 --- a/debian/arch/arm/config.footbridge +++ b/debian/arch/arm/config.footbridge @@ -349,13 +349,7 @@ CONFIG_MTD_DC21285=y # # 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_MOUSEDEV_SCREEN_Y=768 # 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_BT_HCIBPA10X=m 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_PCMCIA_XIRCOM=m # 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_BLK_DEV_PDC202XX_OLD=m # 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 diff --git a/debian/arch/arm/config.iop32x b/debian/arch/arm/config.iop32x index 38d8b5918..31c2d25e9 100644 --- a/debian/arch/arm/config.iop32x +++ b/debian/arch/arm/config.iop32x @@ -609,7 +609,6 @@ CONFIG_MTD_NAND_IDS=m # # Parallel port support # -# CONFIG_PARPORT is not set # # Plug and Play support @@ -982,7 +981,6 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 # 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 diff --git a/debian/arch/arm/config.ixp4xx b/debian/arch/arm/config.ixp4xx index d37012279..31db8b5f5 100644 --- a/debian/arch/arm/config.ixp4xx +++ b/debian/arch/arm/config.ixp4xx @@ -650,7 +650,6 @@ CONFIG_MTD_NAND_IDS=m # # Parallel port support # -# CONFIG_PARPORT is not set # # Plug and Play support @@ -947,7 +946,6 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 # 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 diff --git a/debian/arch/arm/config.nslu2 b/debian/arch/arm/config.nslu2 index 8dca1e752..12d8478fe 100644 --- a/debian/arch/arm/config.nslu2 +++ b/debian/arch/arm/config.nslu2 @@ -654,7 +654,6 @@ CONFIG_MTD_NAND_IDS=m # # Parallel port support # -# CONFIG_PARPORT is not set # # Plug and Play support @@ -951,7 +950,6 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 # 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 diff --git a/debian/arch/arm/config.rpc b/debian/arch/arm/config.rpc index 0bff5eed2..7e263545a 100644 --- a/debian/arch/arm/config.rpc +++ b/debian/arch/arm/config.rpc @@ -249,13 +249,7 @@ CONFIG_FW_LOADER=m # # 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_MOUSEDEV_SCREEN_Y=768 # 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 diff --git a/debian/arch/arm/config.s3c2410 b/debian/arch/arm/config.s3c2410 index 22d5663a3..e20658ca8 100644 --- a/debian/arch/arm/config.s3c2410 +++ b/debian/arch/arm/config.s3c2410 @@ -369,11 +369,7 @@ CONFIG_MTD_NAND_S3C2410=y # # 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_MOUSEDEV_SCREEN_Y=768 # 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_PPP_MULTILINK=y # 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 diff --git a/debian/arch/armeb/config.nslu2 b/debian/arch/armeb/config.nslu2 index f47af5bd1..672469be1 100644 --- a/debian/arch/armeb/config.nslu2 +++ b/debian/arch/armeb/config.nslu2 @@ -654,7 +654,6 @@ CONFIG_MTD_NAND_IDS=m # # Parallel port support # -# CONFIG_PARPORT is not set # # Plug and Play support @@ -951,7 +950,6 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 # 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 diff --git a/debian/arch/config b/debian/arch/config index b5fa289c5..f6a2243cf 100644 --- a/debian/arch/config +++ b/debian/arch/config @@ -1025,3 +1025,13 @@ CONFIG_SERIAL_8250_PCI=y 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 diff --git a/debian/arch/hppa/config b/debian/arch/hppa/config index 8f3696bef..c94303e72 100644 --- a/debian/arch/hppa/config +++ b/debian/arch/hppa/config @@ -81,14 +81,6 @@ CONFIG_STANDALONE=y 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_MOUSEDEV_SCREEN_Y=768 # 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_CC_OPTIMIZE_FOR_SIZE=y 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 diff --git a/debian/arch/i386/config b/debian/arch/i386/config index 3c6fb5c49..1bf8a8f32 100644 --- a/debian/arch/i386/config +++ b/debian/arch/i386/config @@ -231,15 +231,6 @@ CONFIG_MTD_NAND_DISKONCHIP=m 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=m 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 diff --git a/debian/arch/i386/defines b/debian/arch/i386/defines index 839609e56..1ec7a1bb7 100644 --- a/debian/arch/i386/defines +++ b/debian/arch/i386/defines @@ -15,6 +15,10 @@ subarches: 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 diff --git a/debian/arch/ia64/config b/debian/arch/ia64/config index d6e2154c0..059eef692 100644 --- a/debian/arch/ia64/config +++ b/debian/arch/ia64/config @@ -156,15 +156,6 @@ CONFIG_MTD_NAND_DISKONCHIP=m 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=m 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 diff --git a/debian/arch/m68k/config b/debian/arch/m68k/config index 42f071015..89a98d5bb 100644 --- a/debian/arch/m68k/config +++ b/debian/arch/m68k/config @@ -127,7 +127,6 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 # 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 diff --git a/debian/arch/m68k/config.amiga b/debian/arch/m68k/config.amiga index c56809da0..4558c9e5d 100644 --- a/debian/arch/m68k/config.amiga +++ b/debian/arch/m68k/config.amiga @@ -23,13 +23,8 @@ CONFIG_AMIGA_PCMCIA=y 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 diff --git a/debian/arch/m68k/config.atari b/debian/arch/m68k/config.atari index cbc8877d2..0bacaf42b 100644 --- a/debian/arch/m68k/config.atari +++ b/debian/arch/m68k/config.atari @@ -18,12 +18,7 @@ CONFIG_M68KFPU_EMU_EXTRAPREC=y # 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 diff --git a/debian/arch/m68k/config.bvme6000 b/debian/arch/m68k/config.bvme6000 index 5d86725c4..a2543f1d1 100644 --- a/debian/arch/m68k/config.bvme6000 +++ b/debian/arch/m68k/config.bvme6000 @@ -18,7 +18,6 @@ CONFIG_M68040=y 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 diff --git a/debian/arch/m68k/config.hp b/debian/arch/m68k/config.hp index 9dca2cdb6..15529dba8 100644 --- a/debian/arch/m68k/config.hp +++ b/debian/arch/m68k/config.hp @@ -18,7 +18,6 @@ CONFIG_M68KFPU_EMU=y 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 diff --git a/debian/arch/m68k/config.mac b/debian/arch/m68k/config.mac index 4fa723f74..f59b8663f 100644 --- a/debian/arch/m68k/config.mac +++ b/debian/arch/m68k/config.mac @@ -20,7 +20,6 @@ CONFIG_M68KFPU_EMU=y 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 diff --git a/debian/arch/m68k/config.mvme147 b/debian/arch/m68k/config.mvme147 index 42439e862..f3cd152e2 100644 --- a/debian/arch/m68k/config.mvme147 +++ b/debian/arch/m68k/config.mvme147 @@ -17,7 +17,6 @@ CONFIG_M68030=y # 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 diff --git a/debian/arch/m68k/config.mvme16x b/debian/arch/m68k/config.mvme16x index 04ec91ae6..432a7a753 100644 --- a/debian/arch/m68k/config.mvme16x +++ b/debian/arch/m68k/config.mvme16x @@ -18,7 +18,6 @@ CONFIG_M68040=y 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 diff --git a/debian/arch/m68k/config.q40 b/debian/arch/m68k/config.q40 index 64cfb065c..fd9de144f 100644 --- a/debian/arch/m68k/config.q40 +++ b/debian/arch/m68k/config.q40 @@ -19,7 +19,6 @@ CONFIG_M68KFPU_EMU_EXTRAPREC=y # 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 diff --git a/debian/arch/m68k/config.sun3 b/debian/arch/m68k/config.sun3 index 2f2a2a510..ac5988638 100644 --- a/debian/arch/m68k/config.sun3 +++ b/debian/arch/m68k/config.sun3 @@ -5,7 +5,6 @@ CONFIG_MMU_SUN3=y 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 diff --git a/debian/arch/mips/config.r4k-ip22 b/debian/arch/mips/config.r4k-ip22 index 2e31286a8..0adc229f0 100644 --- a/debian/arch/mips/config.r4k-ip22 +++ b/debian/arch/mips/config.r4k-ip22 @@ -520,10 +520,6 @@ CONFIG_FW_LOADER=m # # 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_MOUSEDEV_SCREEN_Y=768 # 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 diff --git a/debian/arch/mips/config.r5k-ip32 b/debian/arch/mips/config.r5k-ip32 index 84722e2bc..5102c0755 100644 --- a/debian/arch/mips/config.r5k-ip32 +++ b/debian/arch/mips/config.r5k-ip32 @@ -521,12 +521,7 @@ CONFIG_FW_LOADER=m # # 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_MOUSEDEV_SCREEN_Y=768 # 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 diff --git a/debian/arch/mips/config.sb1-bcm91250a b/debian/arch/mips/config.sb1-bcm91250a index 110c3abc9..a56bcbbcd 100644 --- a/debian/arch/mips/config.sb1-bcm91250a +++ b/debian/arch/mips/config.sb1-bcm91250a @@ -540,10 +540,6 @@ CONFIG_FW_LOADER=m # # 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_MOUSEDEV_SCREEN_Y=768 # 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_DUALSPEED=y # 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 diff --git a/debian/arch/mips/config.sb1a-bcm91480b b/debian/arch/mips/config.sb1a-bcm91480b index 1ca19f66c..a168c0b7f 100644 --- a/debian/arch/mips/config.sb1a-bcm91480b +++ b/debian/arch/mips/config.sb1a-bcm91480b @@ -536,10 +536,6 @@ CONFIG_FW_LOADER=m # # 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_MOUSEDEV_SCREEN_Y=768 # 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 diff --git a/debian/arch/mipsel/config.r3k-kn02 b/debian/arch/mipsel/config.r3k-kn02 index a16b138fa..a43230a27 100644 --- a/debian/arch/mipsel/config.r3k-kn02 +++ b/debian/arch/mipsel/config.r3k-kn02 @@ -471,12 +471,6 @@ CONFIG_FW_LOADER=m # # 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_MOUSEDEV_SCREEN_Y=768 # 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 diff --git a/debian/arch/mipsel/config.r4k-kn04 b/debian/arch/mipsel/config.r4k-kn04 index e5532ae48..5edabef4a 100644 --- a/debian/arch/mipsel/config.r4k-kn04 +++ b/debian/arch/mipsel/config.r4k-kn04 @@ -473,12 +473,6 @@ CONFIG_FW_LOADER=m # # 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_MOUSEDEV_SCREEN_Y=768 # 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 diff --git a/debian/arch/mipsel/config.r5k-cobalt b/debian/arch/mipsel/config.r5k-cobalt index ddb8ffb67..173bb383d 100644 --- a/debian/arch/mipsel/config.r5k-cobalt +++ b/debian/arch/mipsel/config.r5k-cobalt @@ -468,13 +468,6 @@ CONFIG_FW_LOADER=m # # 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_MOUSEDEV_SCREEN_Y=768 # 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 diff --git a/debian/arch/mipsel/config.sb1-bcm91250a b/debian/arch/mipsel/config.sb1-bcm91250a index 5f2cc46cc..bd52749a4 100644 --- a/debian/arch/mipsel/config.sb1-bcm91250a +++ b/debian/arch/mipsel/config.sb1-bcm91250a @@ -540,10 +540,6 @@ CONFIG_FW_LOADER=m # # 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_MOUSEDEV_SCREEN_Y=768 # 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_DUALSPEED=y # 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 diff --git a/debian/arch/mipsel/config.sb1a-bcm91480b b/debian/arch/mipsel/config.sb1a-bcm91480b index e30dfb023..49c70f3bf 100644 --- a/debian/arch/mipsel/config.sb1a-bcm91480b +++ b/debian/arch/mipsel/config.sb1a-bcm91480b @@ -536,10 +536,6 @@ CONFIG_FW_LOADER=m # # 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_MOUSEDEV_SCREEN_Y=768 # 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 diff --git a/debian/arch/powerpc/config b/debian/arch/powerpc/config index 700123127..2159cb4ab 100644 --- a/debian/arch/powerpc/config +++ b/debian/arch/powerpc/config @@ -107,7 +107,6 @@ CONFIG_TASK_SIZE=0x80000000 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=m 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 diff --git a/debian/arch/powerpc/config.apus b/debian/arch/powerpc/config.apus index 3b8a31499..b44e2f1ac 100644 --- a/debian/arch/powerpc/config.apus +++ b/debian/arch/powerpc/config.apus @@ -81,9 +81,7 @@ CONFIG_BLK_DEV_BUDDHA=y 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_JOYSTICK_AMIGA=m 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 diff --git a/debian/arch/sparc/config b/debian/arch/sparc/config index 2797d2426..1d1d3327d 100644 --- a/debian/arch/sparc/config +++ b/debian/arch/sparc/config @@ -14,11 +14,7 @@ CONFIG_PCI=y # 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_MOUSEDEV_SCREEN_Y=768 # 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_I2C_ISA=m 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 diff --git a/debian/arch/sparc/config.sparc32 b/debian/arch/sparc/config.sparc32 index 460aa99d3..35c83ab6d 100644 --- a/debian/arch/sparc/config.sparc32 +++ b/debian/arch/sparc/config.sparc32 @@ -305,11 +305,7 @@ CONFIG_CONNECTOR=m # # 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_MOUSEDEV_SCREEN_Y=768 # 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 diff --git a/debian/arch/sparc/config.sparc64 b/debian/arch/sparc/config.sparc64 index d2a54c016..03a530413 100644 --- a/debian/arch/sparc/config.sparc64 +++ b/debian/arch/sparc/config.sparc64 @@ -19,8 +19,6 @@ CONFIG_COMPAT=y 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 diff --git a/debian/arch/sparc/config.sparc64-smp b/debian/arch/sparc/config.sparc64-smp index ee1d79aa8..add343c30 100644 --- a/debian/arch/sparc/config.sparc64-smp +++ b/debian/arch/sparc/config.sparc64-smp @@ -23,8 +23,6 @@ CONFIG_COMPAT=y 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 diff --git a/debian/changelog b/debian/changelog index c8150db10..4a6f97d27 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,7 +9,13 @@ linux-2.6 (2.6.17+2.6.18-rc6-0experimental.2) UNRELEASED; urgency=low [ Sven Luther ] * [powerpc] Enabled the -prep flavour. - -- Sven Luther 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 Fri, 8 Sep 2006 11:50:43 +0200 linux-2.6 (2.6.17+2.6.18-rc6-0experimental.1) UNRELEASED; urgency=low