diff --git a/debian/changelog b/debian/changelog index ae83990ae..3e8ce7bb7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +linux (4.2~rc8-1~exp2) UNRELEASED; urgency=medium + + * Remove all support for ia64 (Closes: #679545, #691576, #728706) + + -- Ben Hutchings Tue, 25 Aug 2015 18:50:57 +0100 + linux (4.2~rc8-1~exp1) experimental; urgency=medium * New upstream release candidate diff --git a/debian/config/config b/debian/config/config index 77bdda83f..5e59efe00 100644 --- a/debian/config/config +++ b/debian/config/config @@ -810,7 +810,7 @@ CONFIG_I2C_VIPERBOARD=m ## file: drivers/ide/Kconfig ## # CONFIG_IDE is not set -#. But for ia64 and m68k flavours that need it +#. But for m68k flavours that need it CONFIG_IDE_GD=m CONFIG_IDE_GD_ATA=y CONFIG_IDE_GD_ATAPI=y diff --git a/debian/config/defines b/debian/config/defines index cf6d73f6f..f03709a2c 100644 --- a/debian/config/defines +++ b/debian/config/defines @@ -10,7 +10,6 @@ arches: armhf hppa i386 - ia64 m68k mips mipsel diff --git a/debian/config/ia64/config b/debian/config/ia64/config deleted file mode 100644 index cf9e5eebd..000000000 --- a/debian/config/ia64/config +++ /dev/null @@ -1,858 +0,0 @@ -## -## file: arch/ia64/Kconfig -## -CONFIG_HOTPLUG_CPU=y -CONFIG_SCHED_SMT=y -CONFIG_PERMIT_BSP_REMOVE=y -CONFIG_NODES_SHIFT=8 -CONFIG_IA64_MCA_RECOVERY=m -CONFIG_PERFMON=y -CONFIG_IA64_PALINFO=m -CONFIG_KEXEC=y -CONFIG_CRASH_DUMP=y -CONFIG_MSPEC=m - -## -## file: arch/ia64/Kconfig.debug -## -## choice: Physical memory granularity -CONFIG_IA64_GRANULE_16MB=y -# CONFIG_IA64_GRANULE_64MB is not set -## end choice -CONFIG_IA64_PRINT_HAZARDS=y -# CONFIG_DISABLE_VHPT is not set -# CONFIG_IA64_DEBUG_CMPXCHG is not set -# CONFIG_IA64_DEBUG_IRQ is not set - -## -## file: arch/ia64/hp/sim/Kconfig -## -# CONFIG_HP_SIMETH is not set -# CONFIG_HP_SIMSERIAL is not set -# CONFIG_HP_SIMSCSI is not set - -## -## file: block/partitions/Kconfig -## -CONFIG_ACORN_PARTITION=y -# CONFIG_ACORN_PARTITION_CUMANA is not set -CONFIG_ACORN_PARTITION_EESOX=y -CONFIG_ACORN_PARTITION_ICS=y -CONFIG_ACORN_PARTITION_ADFS=y -CONFIG_ACORN_PARTITION_POWERTEC=y -CONFIG_ACORN_PARTITION_RISCIX=y -CONFIG_OSF_PARTITION=y -CONFIG_AMIGA_PARTITION=y -CONFIG_ATARI_PARTITION=y -CONFIG_MAC_PARTITION=y -CONFIG_BSD_DISKLABEL=y -CONFIG_MINIX_SUBPARTITION=y -CONFIG_SOLARIS_X86_PARTITION=y -CONFIG_UNIXWARE_DISKLABEL=y -CONFIG_LDM_PARTITION=y -CONFIG_LDM_DEBUG=y -CONFIG_SGI_PARTITION=y -CONFIG_ULTRIX_PARTITION=y -CONFIG_SUN_PARTITION=y - -## -## file: drivers/acpi/Kconfig -## -CONFIG_ACPI_DOCK=y -CONFIG_ACPI_PCI_SLOT=y -CONFIG_ACPI_CONTAINER=y - -## -## file: drivers/ata/Kconfig -## -CONFIG_PATA_ALI=m -CONFIG_PATA_AMD=m -CONFIG_PATA_CMD64X=m -CONFIG_PATA_CS5520=m -CONFIG_PATA_EFAR=m -CONFIG_PATA_HPT366=m -CONFIG_PATA_HPT37X=m -CONFIG_PATA_NETCELL=m -CONFIG_PATA_NS87415=m -CONFIG_PATA_OLDPIIX=m -CONFIG_PATA_PDC2027X=m -CONFIG_PATA_PDC_OLD=m -CONFIG_PATA_SC1200=m -CONFIG_PATA_SERVERWORKS=m -CONFIG_PATA_SIL680=m -CONFIG_PATA_TRIFLEX=m -CONFIG_PATA_VIA=m -CONFIG_PATA_MPIIX=m -CONFIG_PATA_NS87410=m -CONFIG_PATA_OPTI=m -CONFIG_PATA_LEGACY=m - -## -## file: drivers/block/Kconfig -## -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_SX8=m -CONFIG_CDROM_PKTCDVD=m -CONFIG_CDROM_PKTCDVD_BUFFERS=8 -# CONFIG_CDROM_PKTCDVD_WCACHE is not set - -## -## file: drivers/char/Kconfig -## -CONFIG_SGI_SNSC=y -CONFIG_SGI_TIOCX=y -CONFIG_SGI_MBCS=m -CONFIG_PRINTER=m -# CONFIG_LP_CONSOLE is not set -CONFIG_PPDEV=m -CONFIG_DTLK=m -CONFIG_APPLICOM=m -CONFIG_RAW_DRIVER=m -CONFIG_MAX_RAW_DEVS=256 -CONFIG_HPET=y -# CONFIG_HPET_MMAP is not set -CONFIG_MMTIMER=m - -## -## file: drivers/char/agp/Kconfig -## -#. Workaround -CONFIG_AGP=y -#. Workaround -CONFIG_AGP_I460=y -#. Workaround -CONFIG_AGP_HP_ZX1=y -#. Workaround -CONFIG_AGP_SGI_TIOCA=y - -## -## file: drivers/char/ipmi/Kconfig -## -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 - -## -## file: drivers/cpufreq/Kconfig -## -CONFIG_IA64_ACPI_CPUFREQ=m - -## -## file: drivers/firmware/Kconfig -## -CONFIG_DMIID=y - -## -## file: drivers/firmware/efi/Kconfig -## -CONFIG_EFI_VARS=y - -## -## file: drivers/gpu/drm/Kconfig -## -CONFIG_DRM=m -CONFIG_DRM_TDFX=m -CONFIG_DRM_R128=m -CONFIG_DRM_RADEON=m -CONFIG_DRM_MGA=m -CONFIG_DRM_SIS=m - -## -## file: drivers/gpu/drm/i2c/Kconfig -## -CONFIG_DRM_I2C_CH7006=m -CONFIG_DRM_I2C_SIL164=m - -## -## file: drivers/gpu/drm/nouveau/Kconfig -## -CONFIG_DRM_NOUVEAU=m -# CONFIG_DRM_NOUVEAU_BACKLIGHT is not set - -## -## file: drivers/hid/usbhid/Kconfig -## -CONFIG_USB_HID=m -# CONFIG_HID_PID is not set - -## -## file: drivers/hwmon/Kconfig -## -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_F71805F=m -CONFIG_SENSORS_GL518SM=m -CONFIG_SENSORS_GL520SM=m -CONFIG_SENSORS_IT87=m -CONFIG_SENSORS_MAX1619=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_PC87360=m -CONFIG_SENSORS_PCF8591=m -CONFIG_SENSORS_SIS5595=m -CONFIG_SENSORS_SMSC47M1=m -CONFIG_SENSORS_SMSC47B397=m -CONFIG_SENSORS_VIA686A=m -CONFIG_SENSORS_W83781D=m -CONFIG_SENSORS_W83L785TS=m -CONFIG_SENSORS_W83627HF=m - -## -## file: drivers/i2c/Kconfig -## -CONFIG_I2C=m -CONFIG_I2C_CHARDEV=m -CONFIG_I2C_STUB=m -# CONFIG_I2C_DEBUG_CORE is not set -# CONFIG_I2C_DEBUG_ALGO is not set -# CONFIG_I2C_DEBUG_BUS is not set - -## -## file: drivers/i2c/busses/Kconfig -## -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_PIIX4=m -CONFIG_I2C_NFORCE2=m -CONFIG_I2C_SIS5595=m -CONFIG_I2C_SIS630=m -CONFIG_I2C_SIS96X=m -CONFIG_I2C_VIA=m -CONFIG_I2C_VIAPRO=m -CONFIG_I2C_PARPORT=m -CONFIG_I2C_PARPORT_LIGHT=m -CONFIG_I2C_PCA_ISA=m -CONFIG_SCx200_ACB=m - -## -## file: drivers/ide/Kconfig -## -CONFIG_IDE=m -CONFIG_IDE_GD=m -# CONFIG_BLK_DEV_IDECS is not set -CONFIG_BLK_DEV_IDECD=m -CONFIG_BLK_DEV_IDETAPE=m -# CONFIG_IDE_GENERIC is not set -# CONFIG_BLK_DEV_IDEPNP is not set -# CONFIG_BLK_DEV_GENERIC is not set -# CONFIG_BLK_DEV_OPTI621 is not set -# CONFIG_BLK_DEV_AEC62XX is not set -# CONFIG_BLK_DEV_ALI15X3 is not set -# CONFIG_BLK_DEV_AMD74XX is not set -# CONFIG_BLK_DEV_CMD64X is not set -# CONFIG_BLK_DEV_TRIFLEX is not set -# CONFIG_BLK_DEV_CS5520 is not set -# CONFIG_BLK_DEV_HPT366 is not set -# CONFIG_BLK_DEV_SC1200 is not set -# CONFIG_BLK_DEV_PIIX is not set -# CONFIG_BLK_DEV_NS87415 is not set -# CONFIG_BLK_DEV_PDC202XX_OLD is not set -# CONFIG_BLK_DEV_PDC202XX_NEW is not set -# CONFIG_BLK_DEV_SVWKS is not set -CONFIG_BLK_DEV_SGIIOC4=m -# CONFIG_BLK_DEV_SIIMAGE is not set -# CONFIG_BLK_DEV_SLC90E66 is not set -CONFIG_BLK_DEV_TRM290=m -# CONFIG_BLK_DEV_VIA82CXXX is not set - -## -## file: drivers/input/gameport/Kconfig -## -CONFIG_GAMEPORT=m -CONFIG_GAMEPORT_NS558=m -CONFIG_GAMEPORT_L4=m -CONFIG_GAMEPORT_EMU10K1=m -CONFIG_GAMEPORT_FM801=m - -## -## file: drivers/input/joystick/Kconfig -## -CONFIG_INPUT_JOYSTICK=y - -## -## file: drivers/input/keyboard/Kconfig -## -CONFIG_INPUT_KEYBOARD=y -CONFIG_KEYBOARD_ATKBD=y -CONFIG_KEYBOARD_LKKBD=m -CONFIG_KEYBOARD_NEWTON=m -CONFIG_KEYBOARD_SUNKBD=m -CONFIG_KEYBOARD_XTKBD=m - -## -## file: drivers/input/misc/Kconfig -## -CONFIG_INPUT_MISC=y -CONFIG_INPUT_UINPUT=m - -## -## file: drivers/input/mouse/Kconfig -## -CONFIG_INPUT_MOUSE=y -CONFIG_MOUSE_PS2=m -CONFIG_MOUSE_SERIAL=m -CONFIG_MOUSE_VSXXXAA=m - -## -## file: drivers/input/serio/Kconfig -## -CONFIG_SERIO=y -CONFIG_SERIO_I8042=y -CONFIG_SERIO_SERPORT=m -CONFIG_SERIO_PARKBD=m -CONFIG_SERIO_PCIPS2=m -CONFIG_SERIO_LIBPS2=y -CONFIG_SERIO_RAW=m - -## -## file: drivers/input/touchscreen/Kconfig -## -# CONFIG_INPUT_TOUCHSCREEN is not set - -## -## file: drivers/isdn/Kconfig -## -CONFIG_ISDN=y -CONFIG_ISDN_CAPI=m - -## -## file: drivers/isdn/capi/Kconfig -## -CONFIG_ISDN_CAPI_CAPI20=m -# CONFIG_ISDN_CAPI_MIDDLEWARE is not set - -## -## file: drivers/isdn/hardware/avm/Kconfig -## -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 - -## -## file: drivers/isdn/hardware/eicon/Kconfig -## -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 - -## -## file: drivers/media/radio/Kconfig -## -CONFIG_USB_DSBR=m -CONFIG_RADIO_MAXIRADIO=m - -## -## file: drivers/mmc/Kconfig -## -CONFIG_MMC=m -# CONFIG_MMC_DEBUG is not set - -## -## file: drivers/mmc/card/Kconfig -## -CONFIG_MMC_BLOCK=m - -## -## file: drivers/net/Kconfig -## -CONFIG_NET_FC=y -CONFIG_NET_SB1000=m - -## -## file: drivers/net/arcnet/Kconfig -## -CONFIG_ARCNET=m -CONFIG_ARCNET_1201=m -CONFIG_ARCNET_1051=m -CONFIG_ARCNET_RAW=m -CONFIG_ARCNET_CAP=m -CONFIG_ARCNET_COM90xx=m -CONFIG_ARCNET_COM90xxIO=m -CONFIG_ARCNET_RIM_I=m -CONFIG_ARCNET_COM20020=m -CONFIG_ARCNET_COM20020_PCI=m -CONFIG_ARCNET_COM20020_CS=m - -## -## file: drivers/net/ethernet/Kconfig -## -CONFIG_FEALNX=m - -## -## file: drivers/net/ethernet/3com/Kconfig -## -CONFIG_NET_VENDOR_3COM=y -CONFIG_PCMCIA_3C574=m -CONFIG_PCMCIA_3C589=m -CONFIG_VORTEX=m -CONFIG_TYPHOON=m - -## -## file: drivers/net/ethernet/8390/Kconfig -## -CONFIG_PCMCIA_AXNET=m -CONFIG_NE2K_PCI=m -CONFIG_PCMCIA_PCNET=m - -## -## file: drivers/net/ethernet/adaptec/Kconfig -## -CONFIG_ADAPTEC_STARFIRE=m - -## -## file: drivers/net/ethernet/amd/Kconfig -## -CONFIG_AMD8111_ETH=m -CONFIG_PCMCIA_NMCLAN=m - -## -## file: drivers/net/ethernet/broadcom/Kconfig -## -CONFIG_B44=m - -## -## file: drivers/net/ethernet/dec/tulip/Kconfig -## -CONFIG_NET_TULIP=y -CONFIG_DE2104X=m -CONFIG_TULIP=m -# CONFIG_TULIP_MWI is not set -# CONFIG_TULIP_MMIO is not set -CONFIG_WINBOND_840=m -CONFIG_DM9102=m -CONFIG_PCMCIA_XIRCOM=m - -## -## file: drivers/net/ethernet/dlink/Kconfig -## -CONFIG_SUNDANCE=m -# CONFIG_SUNDANCE_MMIO is not set - -## -## file: drivers/net/ethernet/fujitsu/Kconfig -## -CONFIG_PCMCIA_FMVJ18X=m - -## -## file: drivers/net/ethernet/hp/Kconfig -## -# CONFIG_HP100 is not set - -## -## file: drivers/net/ethernet/intel/Kconfig -## -CONFIG_E100=m - -## -## file: drivers/net/ethernet/natsemi/Kconfig -## -CONFIG_NATSEMI=m - -## -## file: drivers/net/ethernet/nvidia/Kconfig -## -CONFIG_FORCEDETH=m - -## -## file: drivers/net/ethernet/realtek/Kconfig -## -CONFIG_8139CP=m -CONFIG_8139TOO=m -# CONFIG_8139TOO_PIO is not set -# CONFIG_8139TOO_TUNE_TWISTER is not set -# CONFIG_8139TOO_8129 is not set -# CONFIG_8139_OLD_RX_RESET is not set - -## -## file: drivers/net/ethernet/sis/Kconfig -## -CONFIG_SIS900=m - -## -## file: drivers/net/ethernet/smsc/Kconfig -## -CONFIG_PCMCIA_SMC91C92=m -CONFIG_EPIC100=m - -## -## file: drivers/net/ethernet/via/Kconfig -## -CONFIG_VIA_RHINE=m -# CONFIG_VIA_RHINE_MMIO is not set - -## -## file: drivers/net/ethernet/xircom/Kconfig -## -CONFIG_PCMCIA_XIRC2PS=m - -## -## file: drivers/net/fddi/Kconfig -## -CONFIG_FDDI=y -CONFIG_SKFP=m - -## -## file: drivers/net/hippi/Kconfig -## -# CONFIG_HIPPI is not set - -## -## file: drivers/net/irda/Kconfig -## -CONFIG_IRTTY_SIR=m -CONFIG_USB_IRDA=m -CONFIG_SIGMATEL_FIR=m -CONFIG_VLSI_FIR=m - -## -## file: drivers/net/plip/Kconfig -## -CONFIG_PLIP=m - -## -## file: drivers/net/wan/Kconfig -## -CONFIG_WAN=y -CONFIG_LANMEDIA=m -CONFIG_PCI200SYN=m -CONFIG_WANXL=m -CONFIG_FARSYNC=m -CONFIG_DSCC4=m -# CONFIG_DSCC4_PCISYNC is not set -# CONFIG_DSCC4_PCI_RST is not set -CONFIG_DLCI=m -CONFIG_DLCI_MAX=8 - -## -## file: drivers/net/wireless/Kconfig -## -CONFIG_PCMCIA_RAYCS=m -CONFIG_ATMEL=m -CONFIG_PCI_ATMEL=m -CONFIG_PCMCIA_ATMEL=m -CONFIG_AIRO_CS=m -CONFIG_PCMCIA_WL3501=m -CONFIG_USB_ZD1201=m - -## -## file: drivers/net/wireless/ipw2x00/Kconfig -## -CONFIG_IPW2100=m -CONFIG_IPW2100_MONITOR=y - -## -## file: drivers/net/wireless/mwifiex/Kconfig -## -CONFIG_MWIFIEX=m -CONFIG_MWIFIEX_SDIO=m -CONFIG_MWIFIEX_PCIE=m - -## -## file: drivers/net/wireless/orinoco/Kconfig -## -CONFIG_HERMES=m -CONFIG_PLX_HERMES=m -CONFIG_TMD_HERMES=m -CONFIG_PCI_HERMES=m -CONFIG_PCMCIA_HERMES=m -CONFIG_PCMCIA_SPECTRUM=m - -## -## file: drivers/pci/hotplug/Kconfig -## -CONFIG_HOTPLUG_PCI=y -CONFIG_HOTPLUG_PCI_SGI=y - -## -## file: drivers/pcmcia/Kconfig -## -CONFIG_PCCARD=m -CONFIG_PCMCIA=m -CONFIG_CARDBUS=y -CONFIG_YENTA=m -CONFIG_PD6729=m -CONFIG_I82092=m - -## -## file: drivers/rtc/Kconfig -## -CONFIG_RTC_DRV_EFI=y - -## -## file: drivers/scsi/Kconfig -## -CONFIG_SCSI_ARCMSR=m -CONFIG_SCSI_DMX3191D=m -CONFIG_SCSI_IPS=m -CONFIG_SCSI_INITIO=m -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_IPR=m -CONFIG_SCSI_IPR_TRACE=y -CONFIG_SCSI_IPR_DUMP=y -CONFIG_SCSI_QLOGIC_1280=m -CONFIG_SCSI_DC395x=m -CONFIG_SCSI_AM53C974=m - -## -## file: drivers/scsi/megaraid/Kconfig.megaraid -## -CONFIG_MEGARAID_NEWGEN=y -CONFIG_MEGARAID_MM=m -CONFIG_MEGARAID_MAILBOX=m -CONFIG_MEGARAID_LEGACY=m - -## -## file: drivers/scsi/pcmcia/Kconfig -## -CONFIG_PCMCIA_FDOMAIN=m -CONFIG_PCMCIA_QLOGIC=m -CONFIG_PCMCIA_SYM53C500=m - -## -## file: drivers/sn/Kconfig -## -CONFIG_SGI_IOC3=m - -## -## file: drivers/staging/wlan-ng/Kconfig -## -# CONFIG_PRISM2_USB is not set - -## -## file: drivers/tty/Kconfig -## -CONFIG_VT=y -CONFIG_VT_CONSOLE=y -CONFIG_SERIAL_NONSTANDARD=y -CONFIG_ROCKETPORT=m -# CONFIG_CYCLADES is not set -CONFIG_MOXA_INTELLIO=m -# CONFIG_MOXA_SMARTIO is not set -CONFIG_SYNCLINKMP=m -# CONFIG_ISI is not set -CONFIG_N_HDLC=m - -## -## file: drivers/tty/serial/Kconfig -## -CONFIG_SERIAL_SGI_L1_CONSOLE=y -CONFIG_SERIAL_JSM=m -CONFIG_SERIAL_SGI_IOC4=m -CONFIG_SERIAL_SGI_IOC3=m - -## -## file: drivers/tty/serial/8250/Kconfig -## -CONFIG_SERIAL_8250=y -CONFIG_SERIAL_8250_CONSOLE=y -CONFIG_SERIAL_8250_CS=m -CONFIG_SERIAL_8250_NR_UARTS=32 -CONFIG_SERIAL_8250_RUNTIME_UARTS=4 -CONFIG_SERIAL_8250_EXTENDED=y -CONFIG_SERIAL_8250_SHARE_IRQ=y -# CONFIG_SERIAL_8250_DETECT_IRQ is not set -CONFIG_SERIAL_8250_RSA=y - -## -## file: drivers/usb/Kconfig -## -CONFIG_USB=m -CONFIG_USB_USS720=m - -## -## file: drivers/usb/host/Kconfig -## -CONFIG_USB_EHCI_HCD=m -CONFIG_USB_OHCI_HCD=m -CONFIG_USB_UHCI_HCD=m -CONFIG_USB_SL811_HCD=m -CONFIG_USB_SL811_CS=m - -## -## file: drivers/video/console/Kconfig -## -CONFIG_VGA_CONSOLE=y -CONFIG_FRAMEBUFFER_CONSOLE=y - -## -## file: drivers/video/fbdev/Kconfig -## -CONFIG_FB=y -CONFIG_FB_MODE_HELPERS=y -CONFIG_FB_TILEBLITTING=y -CONFIG_FB_CIRRUS=m -CONFIG_FB_PM2=m -# CONFIG_FB_PM2_FIFO_DISCONNECT is not set -CONFIG_FB_CYBER2000=m -CONFIG_FB_ASILIANT=y -# CONFIG_FB_IMSTT is not set -CONFIG_FB_S1D13XXX=m -CONFIG_FB_MATROX=m -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_RADEON=m -CONFIG_FB_RADEON_I2C=y -# CONFIG_FB_RADEON_DEBUG is not set -CONFIG_FB_ATY128=m -CONFIG_FB_ATY=m -CONFIG_FB_ATY_CT=y -CONFIG_FB_ATY_GENERIC_LCD=y -CONFIG_FB_ATY_GX=y -CONFIG_FB_SAVAGE=m -CONFIG_FB_SAVAGE_I2C=y -# CONFIG_FB_SAVAGE_ACCEL is not set -CONFIG_FB_SIS=m -CONFIG_FB_SIS_300=y -CONFIG_FB_SIS_315=y -CONFIG_FB_NEOMAGIC=m -CONFIG_FB_KYRO=m -CONFIG_FB_VOODOO1=m -CONFIG_FB_TRIDENT=m -# CONFIG_FB_VIRTUAL is not set - -## -## file: fs/pstore/Kconfig -## -CONFIG_PSTORE=y - -## -## file: lib/xz/Kconfig -## -CONFIG_XZ_DEC_IA64=y - -## -## file: net/ax25/Kconfig -## -CONFIG_HAMRADIO=y - -## -## file: net/ipv6/Kconfig -## -CONFIG_IPV6=y - -## -## file: net/irda/Kconfig -## -CONFIG_IRDA=m -CONFIG_IRDA_ULTRA=y -CONFIG_IRDA_CACHE_LAST_LSAP=y -CONFIG_IRDA_FAST_RR=y - -## -## file: net/irda/ircomm/Kconfig -## -CONFIG_IRCOMM=m - -## -## file: net/irda/irlan/Kconfig -## -CONFIG_IRLAN=m - -## -## file: net/irda/irnet/Kconfig -## -CONFIG_IRNET=m - -## -## file: security/Kconfig -## -CONFIG_LSM_MMAP_MIN_ADDR=65536 - -## -## file: sound/drivers/Kconfig -## -CONFIG_SND_DUMMY=m -CONFIG_SND_VIRMIDI=m -CONFIG_SND_MTPAV=m -CONFIG_SND_SERIAL_U16550=m -CONFIG_SND_MPU401=m - -## -## file: sound/pci/Kconfig -## -CONFIG_SND_ALS4000=m -CONFIG_SND_ALI5451=m -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_CA0106=m -CONFIG_SND_CMIPCI=m -CONFIG_SND_CS4281=m -CONFIG_SND_CS46XX=m -CONFIG_SND_CS46XX_NEW_DSP=y -CONFIG_SND_EMU10K1=m -CONFIG_SND_EMU10K1X=m -CONFIG_SND_ENS1370=m -CONFIG_SND_ENS1371=m -CONFIG_SND_ES1938=m -CONFIG_SND_ES1968=m -CONFIG_SND_FM801=m -CONFIG_SND_FM801_TEA575X_BOOL=y -CONFIG_SND_HDSP=m -CONFIG_SND_ICE1712=m -CONFIG_SND_ICE1724=m -CONFIG_SND_INTEL8X0=m -CONFIG_SND_INTEL8X0M=m -CONFIG_SND_KORG1212=m -CONFIG_SND_MAESTRO3=m -CONFIG_SND_MIXART=m -CONFIG_SND_NM256=m -CONFIG_SND_RME32=m -CONFIG_SND_RME96=m -CONFIG_SND_RME9652=m -CONFIG_SND_SONICVIBES=m -CONFIG_SND_TRIDENT=m -CONFIG_SND_VIA82XX=m -CONFIG_SND_VIA82XX_MODEM=m -CONFIG_SND_VX222=m -CONFIG_SND_YMFPCI=m - -## -## file: sound/pci/hda/Kconfig -## -CONFIG_SND_HDA_INTEL=m - diff --git a/debian/config/ia64/config.itanium b/debian/config/ia64/config.itanium deleted file mode 100644 index e683b846b..000000000 --- a/debian/config/ia64/config.itanium +++ /dev/null @@ -1,11 +0,0 @@ -## -## file: arch/ia64/Kconfig -## -## choice: Processor type -CONFIG_ITANIUM=y -# CONFIG_MCKINLEY is not set -## end choice -CONFIG_SMP=y -CONFIG_NR_CPUS=64 -# CONFIG_SCHED_SMT is not set - diff --git a/debian/config/ia64/config.mckinley b/debian/config/ia64/config.mckinley deleted file mode 100644 index 6da85354e..000000000 --- a/debian/config/ia64/config.mckinley +++ /dev/null @@ -1,11 +0,0 @@ -## -## file: arch/ia64/Kconfig -## -## choice: Processor type -# CONFIG_ITANIUM is not set -CONFIG_MCKINLEY=y -## end choice -CONFIG_SMP=y -CONFIG_NR_CPUS=64 -# CONFIG_SCHED_SMT is not set - diff --git a/debian/config/ia64/defines b/debian/config/ia64/defines deleted file mode 100644 index 2776b2680..000000000 --- a/debian/config/ia64/defines +++ /dev/null @@ -1,20 +0,0 @@ -[base] -flavours: - itanium - mckinley -kernel-arch: ia64 -compiler: gcc-4.6 - -[build] -image-file: vmlinux.gz - -[image] -bootloaders: elilo -suggests: fdutils -install-stem: vmlinuz - -[itanium_description] -hardware: Itanium - -[mckinley_description] -hardware: Itanium II diff --git a/debian/installer/ia64/TODO b/debian/installer/ia64/TODO deleted file mode 100644 index d02dd6c7d..000000000 --- a/debian/installer/ia64/TODO +++ /dev/null @@ -1,3 +0,0 @@ -* The 2.6 kernel is missing a lot of modules, need to get a list of all - modules included in the udebs, and compare vs. the full module list and - add missing stuff. diff --git a/debian/installer/ia64/kernel-versions b/debian/installer/ia64/kernel-versions deleted file mode 100644 index 24043ff95..000000000 --- a/debian/installer/ia64/kernel-versions +++ /dev/null @@ -1,2 +0,0 @@ -# arch version flavour installedname suffix build-depends -ia64 - itanium - - - diff --git a/debian/installer/ia64/modules/ia64/ata-modules b/debian/installer/ia64/modules/ia64/ata-modules deleted file mode 100644 index b81c0f38b..000000000 --- a/debian/installer/ia64/modules/ia64/ata-modules +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/debian/installer/ia64/modules/ia64/btrfs-modules b/debian/installer/ia64/modules/ia64/btrfs-modules deleted file mode 100644 index e261e1388..000000000 --- a/debian/installer/ia64/modules/ia64/btrfs-modules +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/debian/installer/ia64/modules/ia64/cdrom-core-modules b/debian/installer/ia64/modules/ia64/cdrom-core-modules deleted file mode 100644 index 2c6b1565d..000000000 --- a/debian/installer/ia64/modules/ia64/cdrom-core-modules +++ /dev/null @@ -1,2 +0,0 @@ -#include -ide-cd_mod diff --git a/debian/installer/ia64/modules/ia64/core-modules b/debian/installer/ia64/modules/ia64/core-modules deleted file mode 100644 index f05d06298..000000000 --- a/debian/installer/ia64/modules/ia64/core-modules +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/debian/installer/ia64/modules/ia64/crc-modules b/debian/installer/ia64/modules/ia64/crc-modules deleted file mode 100644 index a642ead8b..000000000 --- a/debian/installer/ia64/modules/ia64/crc-modules +++ /dev/null @@ -1,2 +0,0 @@ -#include - diff --git a/debian/installer/ia64/modules/ia64/crypto-dm-modules b/debian/installer/ia64/modules/ia64/crypto-dm-modules deleted file mode 100644 index 4c8f2354c..000000000 --- a/debian/installer/ia64/modules/ia64/crypto-dm-modules +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/debian/installer/ia64/modules/ia64/crypto-modules b/debian/installer/ia64/modules/ia64/crypto-modules deleted file mode 100644 index 3a1e862b4..000000000 --- a/debian/installer/ia64/modules/ia64/crypto-modules +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/debian/installer/ia64/modules/ia64/event-modules b/debian/installer/ia64/modules/ia64/event-modules deleted file mode 100644 index f8819afd3..000000000 --- a/debian/installer/ia64/modules/ia64/event-modules +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/debian/installer/ia64/modules/ia64/ext4-modules b/debian/installer/ia64/modules/ia64/ext4-modules deleted file mode 100644 index 394c577ce..000000000 --- a/debian/installer/ia64/modules/ia64/ext4-modules +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/debian/installer/ia64/modules/ia64/fat-modules b/debian/installer/ia64/modules/ia64/fat-modules deleted file mode 100644 index 274584eb6..000000000 --- a/debian/installer/ia64/modules/ia64/fat-modules +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/debian/installer/ia64/modules/ia64/fb-modules b/debian/installer/ia64/modules/ia64/fb-modules deleted file mode 100644 index 1442c89f9..000000000 --- a/debian/installer/ia64/modules/ia64/fb-modules +++ /dev/null @@ -1,2 +0,0 @@ -fbcon ? -vgastate diff --git a/debian/installer/ia64/modules/ia64/firewire-core-modules b/debian/installer/ia64/modules/ia64/firewire-core-modules deleted file mode 100644 index 8e5fff165..000000000 --- a/debian/installer/ia64/modules/ia64/firewire-core-modules +++ /dev/null @@ -1,2 +0,0 @@ -#include - diff --git a/debian/installer/ia64/modules/ia64/fuse-modules b/debian/installer/ia64/modules/ia64/fuse-modules deleted file mode 100644 index 0b6ba0c8c..000000000 --- a/debian/installer/ia64/modules/ia64/fuse-modules +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/debian/installer/ia64/modules/ia64/ide-core-modules b/debian/installer/ia64/modules/ia64/ide-core-modules deleted file mode 100644 index 96284d155..000000000 --- a/debian/installer/ia64/modules/ia64/ide-core-modules +++ /dev/null @@ -1 +0,0 @@ -ide-core diff --git a/debian/installer/ia64/modules/ia64/ide-modules b/debian/installer/ia64/modules/ia64/ide-modules deleted file mode 100644 index 3bbc4df76..000000000 --- a/debian/installer/ia64/modules/ia64/ide-modules +++ /dev/null @@ -1,3 +0,0 @@ -ide-gd_mod -sgiioc4 -trm290 diff --git a/debian/installer/ia64/modules/ia64/input-modules b/debian/installer/ia64/modules/ia64/input-modules deleted file mode 100644 index 5ecb595a4..000000000 --- a/debian/installer/ia64/modules/ia64/input-modules +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/debian/installer/ia64/modules/ia64/isofs-modules b/debian/installer/ia64/modules/ia64/isofs-modules deleted file mode 100644 index da4fa9a3c..000000000 --- a/debian/installer/ia64/modules/ia64/isofs-modules +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/debian/installer/ia64/modules/ia64/jfs-modules b/debian/installer/ia64/modules/ia64/jfs-modules deleted file mode 100644 index 7e4d912b9..000000000 --- a/debian/installer/ia64/modules/ia64/jfs-modules +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/debian/installer/ia64/modules/ia64/kernel-image b/debian/installer/ia64/modules/ia64/kernel-image deleted file mode 100644 index 1bb8bf6d7..000000000 --- a/debian/installer/ia64/modules/ia64/kernel-image +++ /dev/null @@ -1 +0,0 @@ -# empty diff --git a/debian/installer/ia64/modules/ia64/loop-modules b/debian/installer/ia64/modules/ia64/loop-modules deleted file mode 100644 index 164467713..000000000 --- a/debian/installer/ia64/modules/ia64/loop-modules +++ /dev/null @@ -1,2 +0,0 @@ -#include - diff --git a/debian/installer/ia64/modules/ia64/md-modules b/debian/installer/ia64/modules/ia64/md-modules deleted file mode 100644 index ade088ddb..000000000 --- a/debian/installer/ia64/modules/ia64/md-modules +++ /dev/null @@ -1,2 +0,0 @@ -#include - diff --git a/debian/installer/ia64/modules/ia64/mouse-modules b/debian/installer/ia64/modules/ia64/mouse-modules deleted file mode 100644 index 15fcb00ea..000000000 --- a/debian/installer/ia64/modules/ia64/mouse-modules +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/debian/installer/ia64/modules/ia64/multipath-modules b/debian/installer/ia64/modules/ia64/multipath-modules deleted file mode 100644 index a8b69b253..000000000 --- a/debian/installer/ia64/modules/ia64/multipath-modules +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/debian/installer/ia64/modules/ia64/nbd-modules b/debian/installer/ia64/modules/ia64/nbd-modules deleted file mode 100644 index 3c9b3e5d4..000000000 --- a/debian/installer/ia64/modules/ia64/nbd-modules +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/debian/installer/ia64/modules/ia64/nic-modules b/debian/installer/ia64/modules/ia64/nic-modules deleted file mode 100644 index 2512e8395..000000000 --- a/debian/installer/ia64/modules/ia64/nic-modules +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/debian/installer/ia64/modules/ia64/nic-shared-modules b/debian/installer/ia64/modules/ia64/nic-shared-modules deleted file mode 100644 index cc84b14dc..000000000 --- a/debian/installer/ia64/modules/ia64/nic-shared-modules +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/debian/installer/ia64/modules/ia64/nic-usb-modules b/debian/installer/ia64/modules/ia64/nic-usb-modules deleted file mode 100644 index c479669b4..000000000 --- a/debian/installer/ia64/modules/ia64/nic-usb-modules +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/debian/installer/ia64/modules/ia64/ntfs-modules b/debian/installer/ia64/modules/ia64/ntfs-modules deleted file mode 100644 index ac1bc6a96..000000000 --- a/debian/installer/ia64/modules/ia64/ntfs-modules +++ /dev/null @@ -1 +0,0 @@ -ntfs diff --git a/debian/installer/ia64/modules/ia64/pata-modules b/debian/installer/ia64/modules/ia64/pata-modules deleted file mode 100644 index b0cd6337a..000000000 --- a/debian/installer/ia64/modules/ia64/pata-modules +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/debian/installer/ia64/modules/ia64/pcmcia-modules b/debian/installer/ia64/modules/ia64/pcmcia-modules deleted file mode 100644 index d7a54f360..000000000 --- a/debian/installer/ia64/modules/ia64/pcmcia-modules +++ /dev/null @@ -1,4 +0,0 @@ -pcmcia -pcmcia_core -pd6729 -rsrc_nonstatic ? diff --git a/debian/installer/ia64/modules/ia64/ppp-modules b/debian/installer/ia64/modules/ia64/ppp-modules deleted file mode 100644 index f1ae9b3d1..000000000 --- a/debian/installer/ia64/modules/ia64/ppp-modules +++ /dev/null @@ -1,2 +0,0 @@ -#include - diff --git a/debian/installer/ia64/modules/ia64/sata-modules b/debian/installer/ia64/modules/ia64/sata-modules deleted file mode 100644 index 071cb860b..000000000 --- a/debian/installer/ia64/modules/ia64/sata-modules +++ /dev/null @@ -1,2 +0,0 @@ -#include - diff --git a/debian/installer/ia64/modules/ia64/scsi-core-modules b/debian/installer/ia64/modules/ia64/scsi-core-modules deleted file mode 100644 index dd65d6614..000000000 --- a/debian/installer/ia64/modules/ia64/scsi-core-modules +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/debian/installer/ia64/modules/ia64/scsi-modules b/debian/installer/ia64/modules/ia64/scsi-modules deleted file mode 100644 index 781aeed8b..000000000 --- a/debian/installer/ia64/modules/ia64/scsi-modules +++ /dev/null @@ -1,3 +0,0 @@ -#include -#include -#include diff --git a/debian/installer/ia64/modules/ia64/serial-modules b/debian/installer/ia64/modules/ia64/serial-modules deleted file mode 100644 index 13dac04fe..000000000 --- a/debian/installer/ia64/modules/ia64/serial-modules +++ /dev/null @@ -1,3 +0,0 @@ -#include -ioc3_serial -ioc4_serial diff --git a/debian/installer/ia64/modules/ia64/sn-modules b/debian/installer/ia64/modules/ia64/sn-modules deleted file mode 100644 index 4274c5f89..000000000 --- a/debian/installer/ia64/modules/ia64/sn-modules +++ /dev/null @@ -1,2 +0,0 @@ -ioc3 -ioc4 diff --git a/debian/installer/ia64/modules/ia64/squashfs-modules b/debian/installer/ia64/modules/ia64/squashfs-modules deleted file mode 100644 index 42d77887a..000000000 --- a/debian/installer/ia64/modules/ia64/squashfs-modules +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/debian/installer/ia64/modules/ia64/udf-modules b/debian/installer/ia64/modules/ia64/udf-modules deleted file mode 100644 index b90d7ee9b..000000000 --- a/debian/installer/ia64/modules/ia64/udf-modules +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/debian/installer/ia64/modules/ia64/uinput-modules b/debian/installer/ia64/modules/ia64/uinput-modules deleted file mode 100644 index 58a833779..000000000 --- a/debian/installer/ia64/modules/ia64/uinput-modules +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/debian/installer/ia64/modules/ia64/usb-modules b/debian/installer/ia64/modules/ia64/usb-modules deleted file mode 100644 index c598dedd8..000000000 --- a/debian/installer/ia64/modules/ia64/usb-modules +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/debian/installer/ia64/modules/ia64/usb-storage-modules b/debian/installer/ia64/modules/ia64/usb-storage-modules deleted file mode 100644 index 272d95e2e..000000000 --- a/debian/installer/ia64/modules/ia64/usb-storage-modules +++ /dev/null @@ -1,2 +0,0 @@ -#include - diff --git a/debian/installer/ia64/modules/ia64/xfs-modules b/debian/installer/ia64/modules/ia64/xfs-modules deleted file mode 100644 index c020b5d39..000000000 --- a/debian/installer/ia64/modules/ia64/xfs-modules +++ /dev/null @@ -1,2 +0,0 @@ -#include - diff --git a/debian/installer/ia64/package-list b/debian/installer/ia64/package-list deleted file mode 100644 index fd1dc0020..000000000 --- a/debian/installer/ia64/package-list +++ /dev/null @@ -1,37 +0,0 @@ -# This file is used to build up the control file. The kernel version and -# "-di" are appended to the package names. Section can be left out. So can -# architecture, which is derived from the files in the modules directory. -# It overwrites specifications from /usr/share/kernel-wedge/package-list. -# -Package: fat-modules -Priority: standard - -Package: ide-core-modules -Depends: kernel-image -Priority: standard -Description: IDE support - This package contains core IDE support for the kernel. - -Package: ide-modules -Depends: kernel-image, ide-core-modules, sn-modules -Priority: standard -Description: IDE drivers - This package contains IDE drivers for the kernel. - -Package: cdrom-core-modules -Depends: kernel-image, scsi-core-modules, ide-modules, isofs-modules - -Package: nic-modules -Depends: kernel-image, nic-shared-modules, core-modules, crc-modules - -Package: serial-modules -Depends: kernel-image, pcmcia-modules, sn-modules - -Package: sn-modules -Depends: kernel-image -Priority: extra -Description: SN modules - This package contains SN modules for Altix systems - -Package: kernel-image -Provides: efi-modules, zlib-modules diff --git a/debian/patches/debian/ia64-hardcode-arch-script-output.patch b/debian/patches/debian/ia64-hardcode-arch-script-output.patch deleted file mode 100644 index 7c3201300..000000000 --- a/debian/patches/debian/ia64-hardcode-arch-script-output.patch +++ /dev/null @@ -1,70 +0,0 @@ -From: dann frazier -Subject: Hardcode arch script output -Date: Mon, 26 Mar 2007 16:30:51 -0600 -Bug-Debian: https://bugs.debian.org/392592 -Forwarded: not-needed - -Here's a patch that simply uses hardcoded definitions instead of -doing the dynamic tests that require architecture-specific scripts. - -I don't particularly like this approach because it restricts -portability and diverts from upstream. But, it is simpler, and this -really needs to be fixed somehow before etch (along with a rebuild of -linux-modules-extra-2.6), so I'm willing to live with it if my other -patch is deemed unacceptable. - -My primary concern is that, in the future, the output of these scripts -will change and we (or our successors) will either not notice or -forget to update the hardcoded values. - -Including the scripts in linux-kbuild will avoid this manual step -altogether, and allow for the possibility of other archs to provide -their own scripts in the future. - ---- a/arch/ia64/Makefile -+++ b/arch/ia64/Makefile -@@ -30,16 +30,7 @@ cflags-y := -pipe $(EXTRA) -ffixed-r13 - - -falign-functions=32 -frename-registers -fno-optimize-sibling-calls - KBUILD_CFLAGS_KERNEL := -mconstant-gp - --GAS_STATUS = $(shell $(srctree)/arch/ia64/scripts/check-gas "$(CC)" "$(OBJDUMP)") --KBUILD_CPPFLAGS += $(shell $(srctree)/arch/ia64/scripts/toolchain-flags "$(CC)" "$(OBJDUMP)" "$(READELF)") -- --ifeq ($(GAS_STATUS),buggy) --$(error Sorry, you need a newer version of the assember, one that is built from \ -- a source-tree that post-dates 18-Dec-2002. You can find a pre-compiled \ -- static binary of such an assembler at: \ -- \ -- ftp://ftp.hpl.hp.com/pub/linux-ia64/gas-030124.tar.gz) --endif -+KBUILD_CPPFLAGS += -DHAVE_WORKING_TEXT_ALIGN -DHAVE_MODEL_SMALL_ATTRIBUTE -DHAVE_SERIALIZE_DIRECTIVE - - KBUILD_CFLAGS += $(cflags-y) - head-y := arch/ia64/kernel/head.o arch/ia64/kernel/init_task.o -@@ -66,7 +57,7 @@ boot := arch/ia64/hp/sim/boot - - PHONY += boot compressed check - --all: compressed unwcheck -+all: compressed - - compressed: vmlinux.gz - -@@ -75,9 +66,6 @@ vmlinuz: vmlinux.gz - vmlinux.gz: vmlinux - $(Q)$(MAKE) $(build)=$(boot) $@ - --unwcheck: vmlinux -- -$(Q)READELF=$(READELF) $(PYTHON) $(srctree)/arch/ia64/scripts/unwcheck.py $< -- - archclean: - $(Q)$(MAKE) $(clean)=$(boot) - -@@ -93,7 +81,6 @@ define archhelp - echo '* compressed - Build compressed kernel image' - echo ' install - Install compressed kernel image' - echo ' boot - Build vmlinux and bootloader for Ski simulator' -- echo '* unwcheck - Check vmlinux for invalid unwind info' - endef - - archprepare: make_nr_irqs_h FORCE diff --git a/debian/patches/series b/debian/patches/series index 67c516f4a..ec98c2482 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -3,7 +3,6 @@ debian/version.patch debian/uname-version-timestamp.patch debian/kernelvariables.patch debian/gitignore.patch -debian/ia64-hardcode-arch-script-output.patch debian/mips-disable-werror.patch debian/arch-sh4-fix-uimage-build.patch debian/powerpcspe-omit-uimage.patch diff --git a/debian/templates/image.plain.bug/include-model b/debian/templates/image.plain.bug/include-model index 532ac5717..60a711266 100644 --- a/debian/templates/image.plain.bug/include-model +++ b/debian/templates/image.plain.bug/include-model @@ -6,7 +6,7 @@ grep_model() { arm*) egrep '^(Processor|Hardware|Revision)\b' /proc/cpuinfo ;; - i386|ia64|x86_64) + i386|x86_64) local found= for name in {sys,product,chassis,bios,board}_{vendor,name,version}; do if [ -f /sys/class/dmi/id/$name ]; then