Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Mahoney <jeffm@suse.com>2014-08-04 12:49:10 -0400
committerJeff Mahoney <jeffm@suse.com>2014-08-04 12:49:10 -0400
commit2821f4cc5749791400261b1866bd9df5fbbfc777 (patch)
tree16b37b4a13a2f36593de04a9b0440eb28d24d4eb
parentbf5b385e8ff735a534e986c0232dd25a5d717061 (diff)
config: resync vanilla configs (no actual changes)
-rw-r--r--config/i386/vanilla4
-rw-r--r--config/ppc/vanilla4
-rw-r--r--config/ppc64/vanilla7
-rw-r--r--config/ppc64le/vanilla7
-rw-r--r--config/s390x/vanilla2
-rw-r--r--config/x86_64/vanilla4
6 files changed, 11 insertions, 17 deletions
diff --git a/config/i386/vanilla b/config/i386/vanilla
index 4cd057d49c..b3370c24d4 100644
--- a/config/i386/vanilla
+++ b/config/i386/vanilla
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/i386 3.16.0-rc6 Kernel Configuration
+# Linux/i386 3.16.0 Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
@@ -1774,8 +1774,8 @@ CONFIG_OF_MDIO=m
CONFIG_OF_PCI=y
CONFIG_OF_PCI_IRQ=y
CONFIG_OF_MTD=y
-CONFIG_PARPORT=m
CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y
+CONFIG_PARPORT=m
CONFIG_PARPORT_PC=m
CONFIG_PARPORT_SERIAL=m
CONFIG_PARPORT_PC_FIFO=y
diff --git a/config/ppc/vanilla b/config/ppc/vanilla
index d65e23dfe0..83f7fd15e9 100644
--- a/config/ppc/vanilla
+++ b/config/ppc/vanilla
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 3.16.0-rc6 Kernel Configuration
+# Linux/powerpc 3.16.0 Kernel Configuration
#
# CONFIG_PPC64 is not set
@@ -1339,8 +1339,8 @@ CONFIG_OF_MDIO=m
CONFIG_OF_PCI=y
CONFIG_OF_PCI_IRQ=y
CONFIG_OF_RESERVED_MEM=y
-CONFIG_PARPORT=m
CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y
+CONFIG_PARPORT=m
CONFIG_PARPORT_PC=m
CONFIG_PARPORT_SERIAL=m
CONFIG_PARPORT_PC_FIFO=y
diff --git a/config/ppc64/vanilla b/config/ppc64/vanilla
index 95696a3f0e..9fd3a84579 100644
--- a/config/ppc64/vanilla
+++ b/config/ppc64/vanilla
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 3.16.0-rc6 Kernel Configuration
+# Linux/powerpc 3.16.0 Kernel Configuration
#
CONFIG_PPC64=y
@@ -1460,8 +1460,8 @@ CONFIG_OF_PCI=y
CONFIG_OF_PCI_IRQ=y
CONFIG_OF_MTD=y
CONFIG_OF_RESERVED_MEM=y
-CONFIG_PARPORT=m
CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y
+CONFIG_PARPORT=m
CONFIG_PARPORT_PC=m
CONFIG_PARPORT_SERIAL=m
CONFIG_PARPORT_PC_FIFO=y
@@ -1603,11 +1603,8 @@ CONFIG_BLK_DEV_IDEDMA_PCI=y
# CONFIG_BLK_DEV_AMD74XX is not set
# CONFIG_BLK_DEV_CMD64X is not set
# CONFIG_BLK_DEV_TRIFLEX is not set
-# CONFIG_BLK_DEV_CS5520 is not set
-# CONFIG_BLK_DEV_CS5530 is not set
# CONFIG_BLK_DEV_HPT366 is not set
# CONFIG_BLK_DEV_JMICRON is not set
-# CONFIG_BLK_DEV_SC1200 is not set
# CONFIG_BLK_DEV_PIIX is not set
CONFIG_BLK_DEV_IT8172=m
# CONFIG_BLK_DEV_IT8213 is not set
diff --git a/config/ppc64le/vanilla b/config/ppc64le/vanilla
index a8ebaacb92..5c95ccfcdf 100644
--- a/config/ppc64le/vanilla
+++ b/config/ppc64le/vanilla
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 3.16.0-rc6 Kernel Configuration
+# Linux/powerpc 3.16.0 Kernel Configuration
#
CONFIG_PPC64=y
@@ -1435,8 +1435,8 @@ CONFIG_OF_PCI=y
CONFIG_OF_PCI_IRQ=y
CONFIG_OF_MTD=y
CONFIG_OF_RESERVED_MEM=y
-CONFIG_PARPORT=m
CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y
+CONFIG_PARPORT=m
CONFIG_PARPORT_PC=m
CONFIG_PARPORT_SERIAL=m
CONFIG_PARPORT_PC_FIFO=y
@@ -1578,11 +1578,8 @@ CONFIG_BLK_DEV_IDEDMA_PCI=y
# CONFIG_BLK_DEV_AMD74XX is not set
# CONFIG_BLK_DEV_CMD64X is not set
# CONFIG_BLK_DEV_TRIFLEX is not set
-# CONFIG_BLK_DEV_CS5520 is not set
-# CONFIG_BLK_DEV_CS5530 is not set
# CONFIG_BLK_DEV_HPT366 is not set
# CONFIG_BLK_DEV_JMICRON is not set
-# CONFIG_BLK_DEV_SC1200 is not set
# CONFIG_BLK_DEV_PIIX is not set
CONFIG_BLK_DEV_IT8172=m
# CONFIG_BLK_DEV_IT8213 is not set
diff --git a/config/s390x/vanilla b/config/s390x/vanilla
index 755c7016d0..ddcbad1789 100644
--- a/config/s390x/vanilla
+++ b/config/s390x/vanilla
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/s390 3.16.0-rc6 Kernel Configuration
+# Linux/s390 3.16.0 Kernel Configuration
#
CONFIG_MMU=y
CONFIG_ZONE_DMA=y
diff --git a/config/x86_64/vanilla b/config/x86_64/vanilla
index ead4b9cbb4..31e4b776a1 100644
--- a/config/x86_64/vanilla
+++ b/config/x86_64/vanilla
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 3.16.0-rc6 Kernel Configuration
+# Linux/x86_64 3.16.0 Kernel Configuration
#
CONFIG_64BIT=y
CONFIG_X86_64=y
@@ -1720,8 +1720,8 @@ CONFIG_MTD_UBI_BEB_LIMIT=20
# CONFIG_MTD_UBI_FASTMAP is not set
CONFIG_MTD_UBI_GLUEBI=m
# CONFIG_MTD_UBI_BLOCK is not set
-CONFIG_PARPORT=m
CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y
+CONFIG_PARPORT=m
CONFIG_PARPORT_PC=m
CONFIG_PARPORT_SERIAL=m
CONFIG_PARPORT_PC_FIFO=y