diff --git a/debian/changelog b/debian/changelog
index e44058a84..d55572316 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ linux (4.2.1-3) UNRELEASED; urgency=medium
 
   * ovl: conditionally use O_LARGEFILE in ovl_copy_up() (Closes: #800724)
   * [x86] ALSA: hda - Disable power_save_node for Thinkpads (Closes: #800694)
+  * i2c: Enable I2C_CHARDEV as a module in all configurations with I2C
+    support (Closes: #800597)
 
  -- Ben Hutchings <ben@decadent.org.uk>  Sat, 03 Oct 2015 00:14:59 +0100
 
diff --git a/debian/config/alpha/config b/debian/config/alpha/config
index 383469ff3..5b31c5dfd 100644
--- a/debian/config/alpha/config
+++ b/debian/config/alpha/config
@@ -249,7 +249,6 @@ 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
diff --git a/debian/config/armhf/config.armmp b/debian/config/armhf/config.armmp
index 0d1e51d94..b1a7daff1 100644
--- a/debian/config/armhf/config.armmp
+++ b/debian/config/armhf/config.armmp
@@ -290,11 +290,6 @@ CONFIG_SENSORS_G762=m
 ##
 CONFIG_HWSPINLOCK_OMAP=m
 
-##
-## file: drivers/i2c/Kconfig
-##
-CONFIG_I2C_CHARDEV=m
-
 ##
 ## file: drivers/i2c/busses/Kconfig
 ##
diff --git a/debian/config/config b/debian/config/config
index 063e30279..236785808 100644
--- a/debian/config/config
+++ b/debian/config/config
@@ -774,6 +774,7 @@ CONFIG_SENSORS_ATK0110=m
 ## file: drivers/i2c/Kconfig
 ##
 CONFIG_I2C_COMPAT=y
+CONFIG_I2C_CHARDEV=m
 # CONFIG_I2C_MUX is not set
 CONFIG_I2C_HELPER_AUTO=y
 # CONFIG_I2C_SLAVE is not set
diff --git a/debian/config/kernelarch-mips/config.4kc-malta b/debian/config/kernelarch-mips/config.4kc-malta
index e175cb8ab..02d19e2a9 100644
--- a/debian/config/kernelarch-mips/config.4kc-malta
+++ b/debian/config/kernelarch-mips/config.4kc-malta
@@ -107,7 +107,6 @@ CONFIG_SENSORS_PCF8591=m
 ## file: drivers/i2c/Kconfig
 ##
 CONFIG_I2C=m
-CONFIG_I2C_CHARDEV=m
 
 ##
 ## file: drivers/i2c/busses/Kconfig
diff --git a/debian/config/kernelarch-mips/config.5kc-malta b/debian/config/kernelarch-mips/config.5kc-malta
index a1dc85d1f..864afd38a 100644
--- a/debian/config/kernelarch-mips/config.5kc-malta
+++ b/debian/config/kernelarch-mips/config.5kc-malta
@@ -109,7 +109,6 @@ CONFIG_SENSORS_PCF8591=m
 ## file: drivers/i2c/Kconfig
 ##
 CONFIG_I2C=m
-CONFIG_I2C_CHARDEV=m
 
 ##
 ## file: drivers/i2c/busses/Kconfig
diff --git a/debian/config/kernelarch-powerpc/config b/debian/config/kernelarch-powerpc/config
index b9a5cf1ae..16d45b2dc 100644
--- a/debian/config/kernelarch-powerpc/config
+++ b/debian/config/kernelarch-powerpc/config
@@ -251,7 +251,6 @@ CONFIG_SENSORS_W83627HF=m
 ## file: drivers/i2c/Kconfig
 ##
 CONFIG_I2C=y
-CONFIG_I2C_CHARDEV=m
 # CONFIG_I2C_STUB is not set
 # CONFIG_I2C_DEBUG_CORE is not set
 # CONFIG_I2C_DEBUG_ALGO is not set
diff --git a/debian/config/kernelarch-sparc/config b/debian/config/kernelarch-sparc/config
index f093ea283..cb0514f56 100644
--- a/debian/config/kernelarch-sparc/config
+++ b/debian/config/kernelarch-sparc/config
@@ -137,7 +137,6 @@ CONFIG_USB_HID=y
 ## file: drivers/i2c/Kconfig
 ##
 CONFIG_I2C=m
-CONFIG_I2C_CHARDEV=m
 # CONFIG_I2C_STUB is not set
 # CONFIG_I2C_DEBUG_CORE is not set
 # CONFIG_I2C_DEBUG_ALGO is not set
diff --git a/debian/config/kernelarch-x86/config b/debian/config/kernelarch-x86/config
index e4df259bb..521ebe44e 100644
--- a/debian/config/kernelarch-x86/config
+++ b/debian/config/kernelarch-x86/config
@@ -593,7 +593,6 @@ CONFIG_SENSORS_ACPI_POWER=m
 ##
 CONFIG_I2C=y
 CONFIG_ACPI_I2C_OPREGION=y
-CONFIG_I2C_CHARDEV=m
 # CONFIG_I2C_DEBUG_CORE is not set
 # CONFIG_I2C_DEBUG_ALGO is not set
 # CONFIG_I2C_DEBUG_BUS is not set