UBUNTU: [Config] CONFIG_SPI_SPIDEV=m commonise

Signed-off-by: Andy Whitcroft <apw@canonical.com>

7 files changed, 1 insertions, 6 deletions

diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index 68d56fea88e..fed0804d56b 100644
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -128,7 +128,6 @@ CONFIG_SND_OPL3_LIB_SEQ=m
 # CONFIG_SND_SBAWE_SEQ is not set
 CONFIG_SPARSEMEM_MANUAL=y
 # CONFIG_SPI_PXA2XX_PCI is not set
-CONFIG_SPI_SPIDEV=m
 # CONFIG_SSB_PCMCIAHOST is not set
 CONFIG_STACK_TRACER=y
 # CONFIG_STANDALONE is not set
diff --git a/debian.master/config/armel/config.common.armel b/debian.master/config/armel/config.common.armel
index 6ebff065467..9d29c76d02d 100644
--- a/debian.master/config/armel/config.common.armel
+++ b/debian.master/config/armel/config.common.armel
@@ -105,7 +105,6 @@ CONFIG_SERIAL_8250=y
 # CONFIG_SND_OPL4_LIB_SEQ is not set
 # CONFIG_SND_SBAWE_SEQ is not set
 # CONFIG_SPI_PXA2XX_PCI is not set
-# CONFIG_SPI_SPIDEV is not set
 # CONFIG_STACK_TRACER is not set
 CONFIG_STANDALONE=y
 CONFIG_STE10XP=y
diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf
index 1da6251a5e4..dc8d7599286 100644
--- a/debian.master/config/armhf/config.common.armhf
+++ b/debian.master/config/armhf/config.common.armhf
@@ -105,7 +105,6 @@ CONFIG_SERIAL_8250=y
 # CONFIG_SND_OPL4_LIB_SEQ is not set
 # CONFIG_SND_SBAWE_SEQ is not set
 # CONFIG_SPI_PXA2XX_PCI is not set
-# CONFIG_SPI_SPIDEV is not set
 # CONFIG_STACK_TRACER is not set
 CONFIG_STANDALONE=y
 CONFIG_STE10XP=y
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index d853354addd..e422ba4d4ec 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -5411,6 +5411,7 @@ CONFIG_SPI_OC_TINY=m
 CONFIG_SPI_OMAP24XX=m
 CONFIG_SPI_PL022=m
 CONFIG_SPI_PXA2XX=m
+CONFIG_SPI_SPIDEV=m
 CONFIG_SPI_TLE62X0=m
 CONFIG_SPI_TOPCLIFF_PCH=m
 # CONFIG_SPI_XILINX is not set
diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386
index e987b934aba..b8569de34a2 100644
--- a/debian.master/config/i386/config.common.i386
+++ b/debian.master/config/i386/config.common.i386
@@ -128,7 +128,6 @@ CONFIG_SND_OPL4_LIB_SEQ=m
 CONFIG_SND_SBAWE_SEQ=m
 # CONFIG_SPARSEMEM_MANUAL is not set
 CONFIG_SPI_PXA2XX_PCI=y
-CONFIG_SPI_SPIDEV=m
 # CONFIG_SSB_PCMCIAHOST is not set
 CONFIG_STACK_TRACER=y
 # CONFIG_STANDALONE is not set
diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc
index 487a78d2c2a..4c97ce7eb2a 100644
--- a/debian.master/config/powerpc/config.common.powerpc
+++ b/debian.master/config/powerpc/config.common.powerpc
@@ -118,7 +118,6 @@ CONFIG_SND_OPL3_LIB_SEQ=m
 # CONFIG_SND_SBAWE_SEQ is not set
 CONFIG_SPARSEMEM_MANUAL=y
 # CONFIG_SPI_PXA2XX_PCI is not set
-CONFIG_SPI_SPIDEV=m
 # CONFIG_SSB_PCMCIAHOST is not set
 # CONFIG_STACK_TRACER is not set
 CONFIG_STANDALONE=y
diff --git a/debian.master/config/ppc64/config.common.ppc64 b/debian.master/config/ppc64/config.common.ppc64
index 663d6253323..172559e3225 100644
--- a/debian.master/config/ppc64/config.common.ppc64
+++ b/debian.master/config/ppc64/config.common.ppc64
@@ -152,7 +152,6 @@ CONFIG_SND_OPL3_LIB_SEQ=m
 # CONFIG_SND_SBAWE_SEQ is not set
 CONFIG_SPARSEMEM_MANUAL=y
 # CONFIG_SPI_PXA2XX_PCI is not set
-CONFIG_SPI_SPIDEV=m
 CONFIG_SSB_PCMCIAHOST=y
 # CONFIG_STACK_TRACER is not set
 CONFIG_STANDALONE=y