[linux] 01/04: Update kconfig for 4.14

debian-kernel at lists.debian.org debian-kernel at lists.debian.org
Wed Oct 4 01:33:30 UTC 2017 

This is an automated email from the git hooks/post-receive script.

benh pushed a commit to branch master
in repository linux.

commit 3ca820dff7c5b6e9867be7f09632ad1fbf18f04f
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Wed Oct 4 02:02:35 2017 +0100

    Update kconfig for 4.14
    
    - [alpha] fbdev: Re-enable FRAMEBUFFER_CONSOLE as built-in
    - [armel] fbdev: Explicitly disable FRAMEBUFFER_CONSOLE, as it can no longer
      be a module
    - [arm64] Re-enable MMC_QCOM_DML
    - Change RC_CORE back to being a module
    - power/supply: Enable BATTERY_BQ27XXX and BATTERY_BQ27XXX_HDQ as modules,
      replacing W1_SLAVE_BQ27000
    
    Clean up with kconfigeditor2 and delete obsolete symbols.
---
 debian/changelog                           | 13 +++++
 debian/config/alpha/config                 | 84 +++++++++++++++--------------
 debian/config/arm64/config                 |  2 +-
 debian/config/armel/config.marvell         |  3 +-
 debian/config/config                       | 47 ++++++++--------
 debian/config/hppa/config                  |  1 -
 debian/config/i386/config                  | 20 ++-----
 debian/config/kernelarch-mips/config.malta | 62 +++++++++++----------
 debian/config/kernelarch-powerpc/config    | 86 +++++++++++++++---------------
 debian/config/kernelarch-sparc/config      | 11 ++--
 debian/config/kernelarch-x86/config        | 79 +++++++++++++--------------
 debian/config/m68k/config                  | 10 ++--
 12 files changed, 209 insertions(+), 209 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 846324c..9c5ed14 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+linux (4.14~rc3-1~exp2) UNRELEASED; urgency=medium
+
+  * Update kconfig for 4.14:
+    - [alpha] fbdev: Re-enable FRAMEBUFFER_CONSOLE as built-in
+    - [armel] fbdev: Explicitly disable FRAMEBUFFER_CONSOLE, as it can no
+      longer be a module
+    - [arm64] Re-enable MMC_QCOM_DML
+    - Change RC_CORE back to being a module
+    - power/supply: Enable BATTERY_BQ27XXX and BATTERY_BQ27XXX_HDQ as modules,
+      replacing W1_SLAVE_BQ27000
+
+ -- Ben Hutchings <ben at decadent.org.uk>  Wed, 04 Oct 2017 01:44:24 +0100
+
 linux (4.14~rc3-1~exp1) experimental; urgency=medium
 
   * New upstream release candidate
diff --git a/debian/config/alpha/config b/debian/config/alpha/config
index bc53980..bd84a7f 100644
--- a/debian/config/alpha/config
+++ b/debian/config/alpha/config
@@ -121,8 +121,6 @@ CONFIG_ATM_HE_USE_SUNI=y
 ## file: drivers/block/Kconfig
 ##
 CONFIG_BLK_DEV_FD=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
@@ -392,7 +390,6 @@ CONFIG_RADIO_ZOLTRIX=m
 ## file: drivers/mmc/Kconfig
 ##
 CONFIG_MMC=m
-# CONFIG_MMC_DEBUG is not set
 
 ##
 ## file: drivers/mmc/core/Kconfig
@@ -400,6 +397,11 @@ CONFIG_MMC=m
 CONFIG_MMC_BLOCK=m
 
 ##
+## file: drivers/mmc/host/Kconfig
+##
+# CONFIG_MMC_DEBUG is not set
+
+##
 ## file: drivers/mtd/Kconfig
 ##
 CONFIG_MTD_REDBOOT_PARTS=y
@@ -644,19 +646,6 @@ CONFIG_ROADRUNNER=m
 # CONFIG_ROADRUNNER_LARGE_RINGS is not set
 
 ##
-## file: drivers/net/irda/Kconfig
-##
-CONFIG_IRTTY_SIR=m
-CONFIG_USB_IRDA=m
-CONFIG_SIGMATEL_FIR=m
-CONFIG_NSC_FIR=m
-CONFIG_WINBOND_FIR=m
-CONFIG_SMC_IRCC_FIR=m
-CONFIG_ALI_FIR=m
-CONFIG_VLSI_FIR=m
-CONFIG_VIA_FIR=m
-
-##
 ## file: drivers/net/plip/Kconfig
 ##
 CONFIG_PLIP=m
@@ -808,6 +797,43 @@ CONFIG_PCMCIA_QLOGIC=m
 CONFIG_PCMCIA_SYM53C500=m
 
 ##
+## file: drivers/staging/irda/drivers/Kconfig
+##
+CONFIG_IRTTY_SIR=m
+CONFIG_USB_IRDA=m
+CONFIG_SIGMATEL_FIR=m
+CONFIG_NSC_FIR=m
+CONFIG_WINBOND_FIR=m
+CONFIG_SMC_IRCC_FIR=m
+CONFIG_ALI_FIR=m
+CONFIG_VLSI_FIR=m
+CONFIG_VIA_FIR=m
+
+##
+## file: drivers/staging/irda/net/Kconfig
+##
+CONFIG_IRDA=m
+CONFIG_IRDA_ULTRA=y
+CONFIG_IRDA_CACHE_LAST_LSAP=y
+CONFIG_IRDA_FAST_RR=y
+# CONFIG_IRDA_DEBUG is not set
+
+##
+## file: drivers/staging/irda/net/ircomm/Kconfig
+##
+CONFIG_IRCOMM=m
+
+##
+## file: drivers/staging/irda/net/irlan/Kconfig
+##
+CONFIG_IRLAN=m
+
+##
+## file: drivers/staging/irda/net/irnet/Kconfig
+##
+CONFIG_IRNET=m
+
+##
 ## file: drivers/tty/Kconfig
 ##
 CONFIG_VT=y
@@ -872,7 +898,7 @@ CONFIG_LCD_CLASS_DEVICE=m
 ##
 CONFIG_VGA_CONSOLE=y
 CONFIG_MDA_CONSOLE=m
-CONFIG_FRAMEBUFFER_CONSOLE=m
+CONFIG_FRAMEBUFFER_CONSOLE=y
 
 ##
 ## file: drivers/video/fbdev/Kconfig
@@ -966,30 +992,6 @@ CONFIG_IPX=m
 # CONFIG_IPX_INTERN is not set
 
 ##
-## file: net/irda/Kconfig
-##
-CONFIG_IRDA=m
-CONFIG_IRDA_ULTRA=y
-CONFIG_IRDA_CACHE_LAST_LSAP=y
-CONFIG_IRDA_FAST_RR=y
-# CONFIG_IRDA_DEBUG is not set
-
-##
-## 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: net/lapb/Kconfig
 ##
 CONFIG_LAPB=m
diff --git a/debian/config/arm64/config b/debian/config/arm64/config
index 6cbbbf2..4a1d72e 100644
--- a/debian/config/arm64/config
+++ b/debian/config/arm64/config
@@ -351,7 +351,7 @@ CONFIG_MMC=y
 ## file: drivers/mmc/host/Kconfig
 ##
 CONFIG_MMC_ARMMMCI=m
-CONFIG_MMC_QCOM_DML=m
+CONFIG_MMC_QCOM_DML=y
 CONFIG_MMC_SDHCI_PLTFM=m
 CONFIG_MMC_SDHCI_OF_ARASAN=m
 CONFIG_MMC_SDHCI_TEGRA=m
diff --git a/debian/config/armel/config.marvell b/debian/config/armel/config.marvell
index bc6ca41..6984910 100644
--- a/debian/config/armel/config.marvell
+++ b/debian/config/armel/config.marvell
@@ -669,7 +669,8 @@ CONFIG_USB_SL811_HCD=m
 ## file: drivers/video/console/Kconfig
 ##
 # CONFIG_VGA_CONSOLE is not set
-CONFIG_FRAMEBUFFER_CONSOLE=m
+#. We want to enable this as a module, but that's not currently possible
+# CONFIG_FRAMEBUFFER_CONSOLE is not set
 
 ##
 ## file: drivers/video/fbdev/Kconfig
diff --git a/debian/config/config b/debian/config/config
index 31ce576..16cc9a2 100644
--- a/debian/config/config
+++ b/debian/config/config
@@ -1783,7 +1783,6 @@ CONFIG_MEDIA_ANALOG_TV_SUPPORT=y
 CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y
 CONFIG_MEDIA_RADIO_SUPPORT=y
 CONFIG_MEDIA_SDR_SUPPORT=y
-CONFIG_MEDIA_RC_SUPPORT=y
 CONFIG_MEDIA_CEC_SUPPORT=y
 CONFIG_MEDIA_CONTROLLER=y
 # CONFIG_VIDEO_V4L2_SUBDEV_API is not set
@@ -1898,7 +1897,6 @@ CONFIG_VIDEO_CX25840=m
 # CONFIG_SOC_CAMERA_MT9T031 is not set
 # CONFIG_SOC_CAMERA_MT9T112 is not set
 # CONFIG_SOC_CAMERA_MT9V022 is not set
-# CONFIG_SOC_CAMERA_OV6650 is not set
 # CONFIG_SOC_CAMERA_OV772X is not set
 # CONFIG_SOC_CAMERA_OV9640 is not set
 # CONFIG_SOC_CAMERA_OV9740 is not set
@@ -2146,6 +2144,7 @@ CONFIG_USB_SI470X=m
 ##
 ## file: drivers/media/rc/Kconfig
 ##
+CONFIG_RC_CORE=m
 CONFIG_RC_DECODERS=y
 CONFIG_LIRC=m
 CONFIG_IR_LIRC_CODEC=m
@@ -3370,25 +3369,6 @@ CONFIG_IEEE802154_ATUSB=m
 CONFIG_IEEE802154_ADF7242=m
 
 ##
-## file: drivers/net/irda/Kconfig
-##
-CONFIG_DONGLE=y
-CONFIG_ESI_DONGLE=m
-CONFIG_ACTISYS_DONGLE=m
-CONFIG_TEKRAM_DONGLE=m
-CONFIG_TOIM3232_DONGLE=m
-CONFIG_LITELINK_DONGLE=m
-CONFIG_MA600_DONGLE=m
-CONFIG_GIRBIL_DONGLE=m
-CONFIG_MCP2120_DONGLE=m
-CONFIG_OLD_BELKIN_DONGLE=m
-CONFIG_ACT200L_DONGLE=m
-CONFIG_KINGSUN_DONGLE=m
-CONFIG_KSDAZZLE_DONGLE=m
-CONFIG_KS959_DONGLE=m
-CONFIG_MCS_FIR=m
-
-##
 ## file: drivers/net/phy/Kconfig
 ##
 # CONFIG_MDIO_BCM_UNIMAC is not set
@@ -4077,7 +4057,9 @@ CONFIG_WM8350_POWER=m
 # CONFIG_BATTERY_DS2780 is not set
 # CONFIG_BATTERY_DS2781 is not set
 # CONFIG_BATTERY_DS2782 is not set
-# CONFIG_BATTERY_BQ27XXX is not set
+CONFIG_BATTERY_BQ27XXX=m
+# CONFIG_BATTERY_BQ27XXX_I2C is not set
+CONFIG_BATTERY_BQ27XXX_HDQ=m
 # CONFIG_BATTERY_MAX17040 is not set
 # CONFIG_BATTERY_MAX17042 is not set
 CONFIG_CHARGER_PCF50633=m
@@ -4566,6 +4548,25 @@ CONFIG_STAGING=y
 # CONFIG_AD2S1210 is not set
 
 ##
+## file: drivers/staging/irda/drivers/Kconfig
+##
+CONFIG_DONGLE=y
+CONFIG_ESI_DONGLE=m
+CONFIG_ACTISYS_DONGLE=m
+CONFIG_TEKRAM_DONGLE=m
+CONFIG_TOIM3232_DONGLE=m
+CONFIG_LITELINK_DONGLE=m
+CONFIG_MA600_DONGLE=m
+CONFIG_GIRBIL_DONGLE=m
+CONFIG_MCP2120_DONGLE=m
+CONFIG_OLD_BELKIN_DONGLE=m
+CONFIG_ACT200L_DONGLE=m
+CONFIG_KINGSUN_DONGLE=m
+CONFIG_KSDAZZLE_DONGLE=m
+CONFIG_KS959_DONGLE=m
+CONFIG_MCS_FIR=m
+
+##
 ## file: drivers/staging/lustre/lustre/Kconfig
 ##
 # CONFIG_LUSTRE_FS is not set
@@ -5247,7 +5248,6 @@ CONFIG_W1_SLAVE_DS2433=m
 # CONFIG_W1_SLAVE_DS2780 is not set
 # CONFIG_W1_SLAVE_DS2781 is not set
 # CONFIG_W1_SLAVE_DS28E04 is not set
-CONFIG_W1_SLAVE_BQ27000=m
 
 ##
 ## file: drivers/watchdog/Kconfig
@@ -6260,7 +6260,6 @@ CONFIG_INET=y
 CONFIG_NETWORK_SECMARK=y
 # CONFIG_NETWORK_PHY_TIMESTAMPING is not set
 CONFIG_NETFILTER=y
-# CONFIG_NETFILTER_DEBUG is not set
 CONFIG_NETFILTER_ADVANCED=y
 CONFIG_BRIDGE_NETFILTER=y
 CONFIG_CGROUP_NET_PRIO=y
diff --git a/debian/config/hppa/config b/debian/config/hppa/config
index 6f79f09..f573ea7 100644
--- a/debian/config/hppa/config
+++ b/debian/config/hppa/config
@@ -28,7 +28,6 @@ CONFIG_PATA_LEGACY=m
 ## file: drivers/block/Kconfig
 ##
 # CONFIG_BLK_DEV_FD is not set
-# CONFIG_BLK_CPQ_CISS_DA is not set
 # CONFIG_BLK_DEV_DAC960 is not set
 # CONFIG_BLK_DEV_UMEM is not set
 # CONFIG_BLK_DEV_SX8 is not set
diff --git a/debian/config/i386/config b/debian/config/i386/config
index af873f7..1d3c9e0 100644
--- a/debian/config/i386/config
+++ b/debian/config/i386/config
@@ -50,11 +50,6 @@ CONFIG_X86_GENERIC=y
 # CONFIG_X86_PPRO_FENCE is not set
 
 ##
-## file: arch/x86/lguest/Kconfig
-##
-# CONFIG_LGUEST_GUEST is not set
-
-##
 ## file: crypto/Kconfig
 ##
 CONFIG_CRYPTO_AES_586=m
@@ -185,11 +180,6 @@ CONFIG_ISDN_DRV_AVMB1_T1ISA=m
 CONFIG_LEDS_WRAP=m
 
 ##
-## file: drivers/lguest/Kconfig
-##
-# CONFIG_LGUEST is not set
-
-##
 ## file: drivers/macintosh/Kconfig
 ##
 # CONFIG_MACINTOSH_DRIVERS is not set
@@ -305,11 +295,6 @@ CONFIG_SCC=m
 # CONFIG_SCC_TRXECHO is not set
 
 ##
-## file: drivers/net/irda/Kconfig
-##
-CONFIG_TOSHIBA_FIR=m
-
-##
 ## file: drivers/net/wan/Kconfig
 ##
 CONFIG_HOSTESS_SV11=m
@@ -423,6 +408,11 @@ CONFIG_COMEDI_PCMUIO=m
 CONFIG_COMEDI_MULTIQ3=m
 
 ##
+## file: drivers/staging/irda/drivers/Kconfig
+##
+CONFIG_TOSHIBA_FIR=m
+
+##
 ## file: drivers/staging/olpc_dcon/Kconfig
 ##
 CONFIG_FB_OLPC_DCON=m
diff --git a/debian/config/kernelarch-mips/config.malta b/debian/config/kernelarch-mips/config.malta
index cf02165..a1b2da6 100644
--- a/debian/config/kernelarch-mips/config.malta
+++ b/debian/config/kernelarch-mips/config.malta
@@ -24,8 +24,6 @@ CONFIG_PATA_NS87410=m
 ## file: drivers/block/Kconfig
 ##
 CONFIG_BLK_DEV_FD=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
@@ -272,14 +270,6 @@ CONFIG_EPIC100=m
 CONFIG_VIA_RHINE=m
 
 ##
-## file: drivers/net/irda/Kconfig
-##
-CONFIG_IRTTY_SIR=m
-CONFIG_USB_IRDA=m
-CONFIG_SIGMATEL_FIR=m
-CONFIG_VLSI_FIR=m
-
-##
 ## file: drivers/net/wireless/atmel/Kconfig
 ##
 CONFIG_ATMEL=m
@@ -355,6 +345,36 @@ CONFIG_MEGARAID_MAILBOX=m
 CONFIG_MEGARAID_LEGACY=m
 
 ##
+## file: drivers/staging/irda/drivers/Kconfig
+##
+CONFIG_IRTTY_SIR=m
+CONFIG_USB_IRDA=m
+CONFIG_SIGMATEL_FIR=m
+CONFIG_VLSI_FIR=m
+
+##
+## file: drivers/staging/irda/net/Kconfig
+##
+CONFIG_IRDA=m
+CONFIG_IRDA_CACHE_LAST_LSAP=y
+CONFIG_IRDA_FAST_RR=y
+
+##
+## file: drivers/staging/irda/net/ircomm/Kconfig
+##
+CONFIG_IRCOMM=m
+
+##
+## file: drivers/staging/irda/net/irlan/Kconfig
+##
+CONFIG_IRLAN=m
+
+##
+## file: drivers/staging/irda/net/irnet/Kconfig
+##
+CONFIG_IRNET=m
+
+##
 ## file: drivers/tty/serial/Kconfig
 ##
 CONFIG_SERIAL_JSM=m
@@ -452,28 +472,6 @@ CONFIG_DECNET_NF_GRABULATOR=m
 CONFIG_IPX=m
 
 ##
-## file: net/irda/Kconfig
-##
-CONFIG_IRDA=m
-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: net/lapb/Kconfig
 ##
 CONFIG_LAPB=m
diff --git a/debian/config/kernelarch-powerpc/config b/debian/config/kernelarch-powerpc/config
index 5f75cfa..3ab4a74 100644
--- a/debian/config/kernelarch-powerpc/config
+++ b/debian/config/kernelarch-powerpc/config
@@ -126,8 +126,6 @@ CONFIG_ATM_HE=m
 ## file: drivers/block/Kconfig
 ##
 CONFIG_BLK_DEV_FD=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
@@ -408,7 +406,6 @@ CONFIG_HP_ILO=m
 ## file: drivers/mmc/Kconfig
 ##
 CONFIG_MMC=m
-# CONFIG_MMC_DEBUG is not set
 
 ##
 ## file: drivers/mmc/core/Kconfig
@@ -416,6 +413,11 @@ CONFIG_MMC=m
 CONFIG_MMC_BLOCK=m
 
 ##
+## file: drivers/mmc/host/Kconfig
+##
+# CONFIG_MMC_DEBUG is not set
+
+##
 ## file: drivers/mtd/Kconfig
 ##
 # CONFIG_MTD is not set
@@ -584,21 +586,6 @@ CONFIG_HIPPI=y
 # CONFIG_ROADRUNNER is not set
 
 ##
-## file: drivers/net/irda/Kconfig
-##
-CONFIG_IRTTY_SIR=m
-# CONFIG_DONGLE is not set
-CONFIG_USB_IRDA=m
-# CONFIG_SIGMATEL_FIR is not set
-CONFIG_NSC_FIR=m
-CONFIG_WINBOND_FIR=m
-# CONFIG_TOSHIBA_FIR is not set
-CONFIG_SMC_IRCC_FIR=m
-CONFIG_ALI_FIR=m
-# CONFIG_VLSI_FIR is not set
-CONFIG_VIA_FIR=m
-
-##
 ## file: drivers/net/wan/Kconfig
 ##
 CONFIG_WAN=y
@@ -734,6 +721,45 @@ CONFIG_PCMCIA_QLOGIC=m
 CONFIG_PCMCIA_SYM53C500=m
 
 ##
+## file: drivers/staging/irda/drivers/Kconfig
+##
+CONFIG_IRTTY_SIR=m
+# CONFIG_DONGLE is not set
+CONFIG_USB_IRDA=m
+# CONFIG_SIGMATEL_FIR is not set
+CONFIG_NSC_FIR=m
+CONFIG_WINBOND_FIR=m
+# CONFIG_TOSHIBA_FIR is not set
+CONFIG_SMC_IRCC_FIR=m
+CONFIG_ALI_FIR=m
+# CONFIG_VLSI_FIR is not set
+CONFIG_VIA_FIR=m
+
+##
+## file: drivers/staging/irda/net/Kconfig
+##
+CONFIG_IRDA=m
+CONFIG_IRDA_ULTRA=y
+CONFIG_IRDA_CACHE_LAST_LSAP=y
+CONFIG_IRDA_FAST_RR=y
+# CONFIG_IRDA_DEBUG is not set
+
+##
+## file: drivers/staging/irda/net/ircomm/Kconfig
+##
+CONFIG_IRCOMM=m
+
+##
+## file: drivers/staging/irda/net/irlan/Kconfig
+##
+CONFIG_IRLAN=m
+
+##
+## file: drivers/staging/irda/net/irnet/Kconfig
+##
+CONFIG_IRNET=m
+
+##
 ## file: drivers/tty/Kconfig
 ##
 CONFIG_VT=y
@@ -880,30 +906,6 @@ CONFIG_IPX=m
 CONFIG_IPX_INTERN=y
 
 ##
-## file: net/irda/Kconfig
-##
-CONFIG_IRDA=m
-CONFIG_IRDA_ULTRA=y
-CONFIG_IRDA_CACHE_LAST_LSAP=y
-CONFIG_IRDA_FAST_RR=y
-# CONFIG_IRDA_DEBUG is not set
-
-##
-## 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: net/lapb/Kconfig
 ##
 CONFIG_LAPB=m
diff --git a/debian/config/kernelarch-sparc/config b/debian/config/kernelarch-sparc/config
index 0ca9d15..6dbc542 100644
--- a/debian/config/kernelarch-sparc/config
+++ b/debian/config/kernelarch-sparc/config
@@ -44,7 +44,6 @@ CONFIG_PATA_LEGACY=m
 ## file: drivers/block/Kconfig
 ##
 CONFIG_BLK_DEV_FD=y
-# CONFIG_BLK_CPQ_CISS_DA is not set
 # CONFIG_BLK_DEV_DAC960 is not set
 # CONFIG_BLK_DEV_UMEM is not set
 CONFIG_BLK_DEV_SX8=m
@@ -427,6 +426,11 @@ CONFIG_MEGARAID_MAILBOX=m
 CONFIG_MEGARAID_LEGACY=m
 
 ##
+## file: drivers/staging/irda/net/Kconfig
+##
+# CONFIG_IRDA is not set
+
+##
 ## file: drivers/tty/Kconfig
 ##
 CONFIG_VT=y
@@ -553,11 +557,6 @@ CONFIG_IPX=m
 # CONFIG_IPX_INTERN is not set
 
 ##
-## file: net/irda/Kconfig
-##
-# CONFIG_IRDA is not set
-
-##
 ## file: net/lapb/Kconfig
 ##
 # CONFIG_LAPB is not set
diff --git a/debian/config/kernelarch-x86/config b/debian/config/kernelarch-x86/config
index e3f3091..155d4e5 100644
--- a/debian/config/kernelarch-x86/config
+++ b/debian/config/kernelarch-x86/config
@@ -267,8 +267,6 @@ CONFIG_KS0108_DELAY=2
 ## file: drivers/block/Kconfig
 ##
 CONFIG_BLK_DEV_FD=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
@@ -940,7 +938,6 @@ CONFIG_VMWARE_VMCI=m
 ## file: drivers/mmc/Kconfig
 ##
 CONFIG_MMC=m
-# CONFIG_MMC_DEBUG is not set
 
 ##
 ## file: drivers/mmc/core/Kconfig
@@ -950,6 +947,7 @@ CONFIG_MMC_BLOCK=m
 ##
 ## file: drivers/mmc/host/Kconfig
 ##
+# CONFIG_MMC_DEBUG is not set
 CONFIG_MMC_SDHCI_ACPI=m
 
 ##
@@ -1206,19 +1204,6 @@ CONFIG_ROADRUNNER=m
 CONFIG_HYPERV_NET=m
 
 ##
-## file: drivers/net/irda/Kconfig
-##
-CONFIG_IRTTY_SIR=m
-CONFIG_USB_IRDA=m
-CONFIG_SIGMATEL_FIR=m
-CONFIG_NSC_FIR=m
-CONFIG_WINBOND_FIR=m
-CONFIG_SMC_IRCC_FIR=m
-CONFIG_ALI_FIR=m
-CONFIG_VLSI_FIR=m
-CONFIG_VIA_FIR=m
-
-##
 ## file: drivers/net/plip/Kconfig
 ##
 CONFIG_PLIP=m
@@ -1586,6 +1571,43 @@ CONFIG_COMEDI_8255_SA=m
 CONFIG_COMEDI_KCOMEDILIB=m
 
 ##
+## file: drivers/staging/irda/drivers/Kconfig
+##
+CONFIG_IRTTY_SIR=m
+CONFIG_USB_IRDA=m
+CONFIG_SIGMATEL_FIR=m
+CONFIG_NSC_FIR=m
+CONFIG_WINBOND_FIR=m
+CONFIG_SMC_IRCC_FIR=m
+CONFIG_ALI_FIR=m
+CONFIG_VLSI_FIR=m
+CONFIG_VIA_FIR=m
+
+##
+## file: drivers/staging/irda/net/Kconfig
+##
+CONFIG_IRDA=m
+# CONFIG_IRDA_ULTRA is not set
+CONFIG_IRDA_CACHE_LAST_LSAP=y
+CONFIG_IRDA_FAST_RR=y
+# CONFIG_IRDA_DEBUG is not set
+
+##
+## file: drivers/staging/irda/net/ircomm/Kconfig
+##
+CONFIG_IRCOMM=m
+
+##
+## file: drivers/staging/irda/net/irlan/Kconfig
+##
+CONFIG_IRLAN=m
+
+##
+## file: drivers/staging/irda/net/irnet/Kconfig
+##
+CONFIG_IRNET=m
+
+##
 ## file: drivers/staging/lustre/lnet/Kconfig
 ##
 CONFIG_LNET=m
@@ -1597,7 +1619,6 @@ CONFIG_LNET_XPRT_IB=m
 ## file: drivers/staging/lustre/lustre/Kconfig
 ##
 CONFIG_LUSTRE_FS=m
-CONFIG_LUSTRE_OBD_MAX_IOCTL_BUFFER=8192
 # CONFIG_LUSTRE_DEBUG_EXPENSIVE_CHECK is not set
 
 ##
@@ -1949,30 +1970,6 @@ CONFIG_IPX=m
 # CONFIG_IPX_INTERN is not set
 
 ##
-## file: net/irda/Kconfig
-##
-CONFIG_IRDA=m
-# CONFIG_IRDA_ULTRA is not set
-CONFIG_IRDA_CACHE_LAST_LSAP=y
-CONFIG_IRDA_FAST_RR=y
-# CONFIG_IRDA_DEBUG is not set
-
-##
-## 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: net/lapb/Kconfig
 ##
 CONFIG_LAPB=m
diff --git a/debian/config/m68k/config b/debian/config/m68k/config
index 88cdbfc..8880373 100644
--- a/debian/config/m68k/config
+++ b/debian/config/m68k/config
@@ -526,6 +526,11 @@ CONFIG_BVME6000_SCSI=m
 # CONFIG_STAGING is not set
 
 ##
+## file: drivers/staging/irda/net/Kconfig
+##
+# CONFIG_IRDA is not set
+
+##
 ## file: drivers/tty/Kconfig
 ##
 CONFIG_VT=y
@@ -806,11 +811,6 @@ CONFIG_IPV6=m
 CONFIG_IPX=m
 
 ##
-## file: net/irda/Kconfig
-##
-# CONFIG_IRDA is not set
-
-##
 ## file: net/lapb/Kconfig
 ##
 # CONFIG_LAPB is not set

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux.git

More information about the Kernel-svn-changes mailing list