From 295134a39229f915058cc449ef4bbc57283f7864 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Thu, 11 Sep 2014 23:11:32 +0000 Subject: [PATCH] [mips64,mips64el] Properly add the 5kc-malta flavour (should fix FTBFS) svn path=/dists/sid/linux/; revision=21808 --- debian/changelog | 1 + debian/config/config | 48 ++++++++++++++++++++++++++++++++++ debian/config/mips64/defines | 1 + debian/config/mips64el/defines | 1 + 4 files changed, 51 insertions(+) diff --git a/debian/changelog b/debian/changelog index 7877d3524..a0e953d2c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,7 @@ linux (3.16.2-3) UNRELEASED; urgency=medium * [arm64] rtc: Enable RTC_DRV_XGENE as modules * mfd,mmc,memstick: Enable MFD_RTSX_USB, MMC_REALTEK_USB, MEMSTICK_REALTEK_USB as modules (Closes: #761099) + * [mips64,mips64el] Properly add the 5kc-malta flavour (should fix FTBFS) [ Ian Campbell ] * [armel/orion5x] udeb: Include mvmdio in nic-modules udeb. diff --git a/debian/config/config b/debian/config/config index bd6cacdfe..723dd1876 100644 --- a/debian/config/config +++ b/debian/config/config @@ -401,6 +401,13 @@ CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y CONFIG_ASYNC_TX_DMA=y # CONFIG_DMATEST is not set +## +## file: drivers/dma/dw/Kconfig +## +# CONFIG_DW_DMAC_CORE is not set +# CONFIG_DW_DMAC is not set +# CONFIG_DW_DMAC_PCI is not set + ## ## file: drivers/edac/Kconfig ## @@ -3548,6 +3555,11 @@ CONFIG_SSB=m ## CONFIG_STAGING=y +## +## file: drivers/staging/bcm/Kconfig +## +# CONFIG_BCM_WIMAX is not set + ## ## file: drivers/staging/android/Kconfig ## @@ -3558,6 +3570,16 @@ CONFIG_STAGING=y ## # CONFIG_COMEDI is not set +## +## file: drivers/staging/cptm1217/Kconfig +## +# CONFIG_TOUCHSCREEN_CLEARPAD_TM1217 is not set + +## +## file: drivers/staging/cxt1e1/Kconfig +## +# CONFIG_CXT1E1 is not set + ## ## file: drivers/staging/crystalhd/Kconfig ## @@ -3573,6 +3595,11 @@ CONFIG_STAGING=y ## # CONFIG_TRANZPORT is not set +## +## file: drivers/staging/ft1000/Kconfig +## +# CONFIG_FT1000 is not set + ## ## file: drivers/staging/line6/Kconfig ## @@ -3638,6 +3665,11 @@ CONFIG_USB_SN9C102=m ## # CONFIG_R8712U is not set +## +## file: drivers/staging/rtl8723au/Kconfig +## +# CONFIG_R8723AU is not set + ## ## file: drivers/staging/rtl8821ae/Kconfig ## @@ -3668,6 +3700,11 @@ CONFIG_USB_SN9C102=m ## # CONFIG_SLICOSS is not set +## +## file: drivers/staging/sm7xxfb/Kconfig +## +# CONFIG_FB_SM7XX is not set + ## ## file: drivers/staging/speakup/Kconfig ## @@ -3687,6 +3724,11 @@ CONFIG_SPEAKUP_SYNTH_SPKOUT=m CONFIG_SPEAKUP_SYNTH_TXPRT=m CONFIG_SPEAKUP_SYNTH_DUMMY=m +## +## file: drivers/staging/ste_rmi4/Kconfig +## +# CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4 is not set + ## ## file: drivers/staging/usbip/Kconfig ## @@ -3712,6 +3754,11 @@ CONFIG_SPEAKUP_SYNTH_DUMMY=m ## # CONFIG_PRISM2_USB is not set +## +## file: drivers/staging/xgifb/Kconfig +## +# CONFIG_FB_XGI is not set + ## ## file: drivers/target/Kconfig ## @@ -4163,6 +4210,7 @@ CONFIG_VIRT_DRIVERS=y ## CONFIG_VIRTIO_PCI=m CONFIG_VIRTIO_BALLOON=m +# CONFIG_VIRTIO_MMIO is not set ## ## file: drivers/vme/Kconfig diff --git a/debian/config/mips64/defines b/debian/config/mips64/defines index 6558f0d02..8463072f7 100644 --- a/debian/config/mips64/defines +++ b/debian/config/mips64/defines @@ -1,6 +1,7 @@ [base] flavours: sb1-bcm91250a + 5kc-malta octeon kernel-arch: mips diff --git a/debian/config/mips64el/defines b/debian/config/mips64el/defines index 41bc336da..3034247cf 100644 --- a/debian/config/mips64el/defines +++ b/debian/config/mips64el/defines @@ -1,6 +1,7 @@ [base] flavours: sb1-bcm91250a + 5kc-malta loongson-2e loongson-2f loongson-3