[linux] 06/07: 8139too: Use same configuration on all architectures

debian-kernel at lists.debian.org debian-kernel at lists.debian.org
Mon May 23 21:38:12 UTC 2016 

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

benh pushed a commit to branch master
in repository linux.

commit e41dc6a9cbabd5936a1e67c1a0a3b1a7e4d2061c
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Mon May 23 13:07:34 2016 +0100

    8139too: Use same configuration on all architectures
    
    Enable 8139TOO_TUNE_TWISTER, 8139TOO_8129 and disable 8139TOO_PIO.
---
 debian/changelog                                 | 2 ++
 debian/config/alpha/config                       | 4 ----
 debian/config/amd64/config                       | 5 -----
 debian/config/arm64/config                       | 4 ----
 debian/config/armel/config.versatile             | 4 ----
 debian/config/armhf/config                       | 4 ----
 debian/config/config                             | 4 ++++
 debian/config/hppa/config                        | 4 ----
 debian/config/i386/config                        | 5 -----
 debian/config/kernelarch-mips/config.4kc-malta   | 3 ---
 debian/config/kernelarch-mips/config.5kc-malta   | 3 ---
 debian/config/kernelarch-mips/config.loongson-2e | 1 -
 debian/config/kernelarch-mips/config.loongson-2f | 1 -
 debian/config/kernelarch-mips/config.loongson-3  | 2 --
 debian/config/kernelarch-powerpc/config          | 4 ----
 debian/config/kernelarch-sparc/config            | 4 ----
 debian/config/kernelarch-x86/config              | 3 ---
 17 files changed, 6 insertions(+), 51 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index cb81d33..efb597d 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 a15db44..d5d8060 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 31d2533..04c40fe 100644
--- a/debian/config/amd64/config
+++ b/debian/config/amd64/config
@@ -131,11 +131,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
 ##
 # CONFIG_IPW2100 is not set
diff --git a/debian/config/arm64/config b/debian/config/arm64/config
index 8caba58..5f30a22 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 301f2a1..af50a23 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 6eb8c36..0b0004e 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 0aec094..bf5bb5c 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 08b453f..f06c212 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 b45a823..dac0d1e 100644
--- a/debian/config/i386/config
+++ b/debian/config/i386/config
@@ -292,11 +292,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
 ##
 CONFIG_NET_VENDOR_SMSC=y
diff --git a/debian/config/kernelarch-mips/config.4kc-malta b/debian/config/kernelarch-mips/config.4kc-malta
index fb45390..7f67c4e 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 18ca9bb..6777557 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 5a70666..f9a20e1 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 704cfc2..406b057 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 29da7d1..dcdc527 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 7bc1280..6929e3a 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 b0e9f6f..c606152 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 47d36b5..f6232e8 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

-- 
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