diff --git a/debian/changelog b/debian/changelog
index cb81d3354..efb597d85 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,8 @@ linux (4.6-1~exp2) UNRELEASED; urgency=medium
     - mmap: Fix use-after-free in remap_file_pages(2)
   * [mips*] Change NFS and various storage and network drivers from built-in
     to modules
+  * 8139too: Use same configuration on all architectures: enable
+    8139TOO_TUNE_TWISTER, 8139TOO_8129 and disable 8139TOO_PIO
 
   [ Aurelien Jarno ]
   * [mips64el] Set CPU to MIPS64 R2.
diff --git a/debian/config/alpha/config b/debian/config/alpha/config
index a15db4465..d5d8060a4 100644
--- a/debian/config/alpha/config
+++ b/debian/config/alpha/config
@@ -594,10 +594,6 @@ CONFIG_FORCEDETH=m
 ##
 CONFIG_8139CP=m
 CONFIG_8139TOO=m
-# CONFIG_8139TOO_PIO is not set
-CONFIG_8139TOO_TUNE_TWISTER=y
-CONFIG_8139TOO_8129=y
-# CONFIG_8139_OLD_RX_RESET is not set
 
 ##
 ## file: drivers/net/ethernet/sis/Kconfig
diff --git a/debian/config/amd64/config b/debian/config/amd64/config
index 31d25335f..04c40fed1 100644
--- a/debian/config/amd64/config
+++ b/debian/config/amd64/config
@@ -130,11 +130,6 @@ CONFIG_MIC_COSM=m
 ##
 CONFIG_FUJITSU_ES=m
 
-##
-## file: drivers/net/ethernet/realtek/Kconfig
-##
-# CONFIG_8139TOO_PIO is not set
-
 ##
 ## file: drivers/net/wireless/intel/ipw2x00/Kconfig
 ##
diff --git a/debian/config/arm64/config b/debian/config/arm64/config
index 8caba5852..5f30a22ba 100644
--- a/debian/config/arm64/config
+++ b/debian/config/arm64/config
@@ -245,10 +245,6 @@ CONFIG_NATSEMI=m
 ##
 CONFIG_8139CP=m
 CONFIG_8139TOO=m
-# CONFIG_8139TOO_PIO is not set
-CONFIG_8139TOO_TUNE_TWISTER=y
-CONFIG_8139TOO_8129=y
-# CONFIG_8139_OLD_RX_RESET is not set
 
 ##
 ## file: drivers/net/ethernet/smsc/Kconfig
diff --git a/debian/config/armel/config.versatile b/debian/config/armel/config.versatile
index 301f2a1b4..af50a2354 100644
--- a/debian/config/armel/config.versatile
+++ b/debian/config/armel/config.versatile
@@ -249,10 +249,6 @@ CONFIG_NATSEMI=m
 ##
 CONFIG_8139CP=m
 CONFIG_8139TOO=m
-# CONFIG_8139TOO_PIO is not set
-CONFIG_8139TOO_TUNE_TWISTER=y
-CONFIG_8139TOO_8129=y
-# CONFIG_8139_OLD_RX_RESET is not set
 
 ##
 ## file: drivers/net/ethernet/silan/Kconfig
diff --git a/debian/config/armhf/config b/debian/config/armhf/config
index 6eb8c36b1..0b0004e62 100644
--- a/debian/config/armhf/config
+++ b/debian/config/armhf/config
@@ -691,10 +691,6 @@ CONFIG_NATSEMI=m
 ##
 CONFIG_8139CP=m
 CONFIG_8139TOO=m
-# CONFIG_8139TOO_PIO is not set
-CONFIG_8139TOO_TUNE_TWISTER=y
-CONFIG_8139TOO_8129=y
-# CONFIG_8139_OLD_RX_RESET is not set
 
 ##
 ## file: drivers/net/ethernet/smsc/Kconfig
diff --git a/debian/config/config b/debian/config/config
index 0aec094b8..bf5bb5ca0 100644
--- a/debian/config/config
+++ b/debian/config/config
@@ -3012,6 +3012,10 @@ CONFIG_R6040=m
 ## file: drivers/net/ethernet/realtek/Kconfig
 ##
 CONFIG_NET_VENDOR_REALTEK=y
+# CONFIG_8139TOO_PIO is not set
+CONFIG_8139TOO_TUNE_TWISTER=y
+CONFIG_8139TOO_8129=y
+# CONFIG_8139_OLD_RX_RESET is not set
 CONFIG_R8169=m
 
 ##
diff --git a/debian/config/hppa/config b/debian/config/hppa/config
index 08b453f7b..f06c212fa 100644
--- a/debian/config/hppa/config
+++ b/debian/config/hppa/config
@@ -291,10 +291,6 @@ CONFIG_FORCEDETH=m
 ##
 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
diff --git a/debian/config/i386/config b/debian/config/i386/config
index b45a82300..dac0d1e97 100644
--- a/debian/config/i386/config
+++ b/debian/config/i386/config
@@ -291,11 +291,6 @@ CONFIG_NET_VENDOR_FUJITSU=y
 ##
 CONFIG_PCH_GBE=m
 
-##
-## file: drivers/net/ethernet/realtek/Kconfig
-##
-CONFIG_8139TOO_PIO=y
-
 ##
 ## file: drivers/net/ethernet/smsc/Kconfig
 ##
diff --git a/debian/config/kernelarch-mips/config.4kc-malta b/debian/config/kernelarch-mips/config.4kc-malta
index fb45390ab..7f67c4ea3 100644
--- a/debian/config/kernelarch-mips/config.4kc-malta
+++ b/debian/config/kernelarch-mips/config.4kc-malta
@@ -261,9 +261,6 @@ CONFIG_NATSEMI=m
 ##
 CONFIG_8139CP=m
 CONFIG_8139TOO=m
-# CONFIG_8139TOO_PIO is not set
-CONFIG_8139TOO_TUNE_TWISTER=y
-CONFIG_8139TOO_8129=y
 
 ##
 ## file: drivers/net/ethernet/sis/Kconfig
diff --git a/debian/config/kernelarch-mips/config.5kc-malta b/debian/config/kernelarch-mips/config.5kc-malta
index 18ca9bbc7..677755723 100644
--- a/debian/config/kernelarch-mips/config.5kc-malta
+++ b/debian/config/kernelarch-mips/config.5kc-malta
@@ -261,9 +261,6 @@ CONFIG_NATSEMI=m
 ##
 CONFIG_8139CP=m
 CONFIG_8139TOO=m
-# CONFIG_8139TOO_PIO is not set
-CONFIG_8139TOO_TUNE_TWISTER=y
-CONFIG_8139TOO_8129=y
 
 ##
 ## file: drivers/net/ethernet/sis/Kconfig
diff --git a/debian/config/kernelarch-mips/config.loongson-2e b/debian/config/kernelarch-mips/config.loongson-2e
index 5a706668c..f9a20e10a 100644
--- a/debian/config/kernelarch-mips/config.loongson-2e
+++ b/debian/config/kernelarch-mips/config.loongson-2e
@@ -50,7 +50,6 @@ CONFIG_INPUT_TOUCHSCREEN=y
 ## file: drivers/net/ethernet/realtek/Kconfig
 ##
 CONFIG_8139TOO=m
-CONFIG_8139TOO_TUNE_TWISTER=y
 
 ##
 ## file: drivers/pci/pcie/Kconfig
diff --git a/debian/config/kernelarch-mips/config.loongson-2f b/debian/config/kernelarch-mips/config.loongson-2f
index 704cfc26f..406b057f0 100644
--- a/debian/config/kernelarch-mips/config.loongson-2f
+++ b/debian/config/kernelarch-mips/config.loongson-2f
@@ -72,7 +72,6 @@ CONFIG_INPUT_TOUCHSCREEN=y
 ## file: drivers/net/ethernet/realtek/Kconfig
 ##
 CONFIG_8139TOO=m
-CONFIG_8139TOO_TUNE_TWISTER=y
 
 ##
 ## file: drivers/pci/pcie/Kconfig
diff --git a/debian/config/kernelarch-mips/config.loongson-3 b/debian/config/kernelarch-mips/config.loongson-3
index 29da7d137..dcdc527b9 100644
--- a/debian/config/kernelarch-mips/config.loongson-3
+++ b/debian/config/kernelarch-mips/config.loongson-3
@@ -54,8 +54,6 @@ CONFIG_E100=m
 ##
 CONFIG_8139CP=m
 CONFIG_8139TOO=m
-CONFIG_8139TOO_TUNE_TWISTER=y
-CONFIG_8139TOO_8129=y
 
 ##
 ## file: drivers/pci/pcie/Kconfig
diff --git a/debian/config/kernelarch-powerpc/config b/debian/config/kernelarch-powerpc/config
index 7bc128019..6929e3a86 100644
--- a/debian/config/kernelarch-powerpc/config
+++ b/debian/config/kernelarch-powerpc/config
@@ -536,10 +536,6 @@ CONFIG_NATSEMI=m
 ##
 CONFIG_8139CP=m
 CONFIG_8139TOO=m
-CONFIG_8139TOO_PIO=y
-# CONFIG_8139TOO_TUNE_TWISTER is not set
-CONFIG_8139TOO_8129=y
-# CONFIG_8139_OLD_RX_RESET is not set
 
 ##
 ## file: drivers/net/ethernet/sis/Kconfig
diff --git a/debian/config/kernelarch-sparc/config b/debian/config/kernelarch-sparc/config
index b0e9f6fea..c6061525e 100644
--- a/debian/config/kernelarch-sparc/config
+++ b/debian/config/kernelarch-sparc/config
@@ -330,10 +330,6 @@ CONFIG_NATSEMI=m
 ##
 # CONFIG_8139CP is not set
 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
diff --git a/debian/config/kernelarch-x86/config b/debian/config/kernelarch-x86/config
index 47d36b5a6..f6232e87a 100644
--- a/debian/config/kernelarch-x86/config
+++ b/debian/config/kernelarch-x86/config
@@ -1122,9 +1122,6 @@ CONFIG_NET_VENDOR_REALTEK=y
 # CONFIG_ATP is not set
 CONFIG_8139CP=m
 CONFIG_8139TOO=m
-CONFIG_8139TOO_TUNE_TWISTER=y
-CONFIG_8139TOO_8129=y
-# CONFIG_8139_OLD_RX_RESET is not set
 
 ##
 ## file: drivers/net/ethernet/sis/Kconfig