summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--baseconfig/CONFIG_I2C_PARPORT_LIGHT2
-rw-r--r--baseconfig/CONFIG_PARPORT2
-rw-r--r--baseconfig/CONFIG_PARPORT_PC2
-rw-r--r--baseconfig/CONFIG_PPS_GENERATOR_PARPORT1
-rw-r--r--baseconfig/arm/CONFIG_PARPORT1
-rw-r--r--baseconfig/arm/arm64/CONFIG_PARPORT_PC1
-rw-r--r--baseconfig/s390x/CONFIG_I2C_PARPORT1
-rw-r--r--baseconfig/s390x/CONFIG_I2C_PARPORT_LIGHT1
-rw-r--r--baseconfig/s390x/CONFIG_PARPORT1
-rw-r--r--baseconfig/x86/CONFIG_I2C_PARPORT (renamed from baseconfig/CONFIG_I2C_PARPORT)0
-rw-r--r--baseconfig/x86/CONFIG_I2C_PARPORT_LIGHT1
-rw-r--r--baseconfig/x86/CONFIG_PARPORT1
-rw-r--r--baseconfig/x86/CONFIG_PARPORT_1284 (renamed from baseconfig/CONFIG_PARPORT_1284)0
-rw-r--r--baseconfig/x86/CONFIG_PARPORT_AX88796 (renamed from baseconfig/CONFIG_PARPORT_AX88796)0
-rw-r--r--baseconfig/x86/CONFIG_PARPORT_PC1
-rw-r--r--baseconfig/x86/CONFIG_PARPORT_PC_FIFO (renamed from baseconfig/CONFIG_PARPORT_PC_FIFO)0
-rw-r--r--baseconfig/x86/CONFIG_PARPORT_PC_PCMCIA (renamed from baseconfig/CONFIG_PARPORT_PC_PCMCIA)0
-rw-r--r--baseconfig/x86/CONFIG_PARPORT_PC_SUPERIO (renamed from baseconfig/CONFIG_PARPORT_PC_SUPERIO)0
-rw-r--r--baseconfig/x86/CONFIG_PARPORT_SERIAL (renamed from baseconfig/CONFIG_PARPORT_SERIAL)0
-rw-r--r--baseconfig/x86/CONFIG_PPS_CLIENT_PARPORT (renamed from baseconfig/CONFIG_PPS_CLIENT_PARPORT)0
-rw-r--r--baseconfig/x86/CONFIG_USB_SERIAL_MOS7715_PARPORT (renamed from baseconfig/CONFIG_USB_SERIAL_MOS7715_PARPORT)0
-rw-r--r--kernel-aarch64-debug.config12
-rw-r--r--kernel-aarch64.config12
-rw-r--r--kernel-armv7hl-debug.config15
-rw-r--r--kernel-armv7hl-lpae-debug.config15
-rw-r--r--kernel-armv7hl-lpae.config15
-rw-r--r--kernel-armv7hl.config15
-rw-r--r--kernel-i686-PAE.config1
-rw-r--r--kernel-i686-PAEdebug.config1
-rw-r--r--kernel-i686-debug.config1
-rw-r--r--kernel-i686.config1
-rw-r--r--kernel-ppc64-debug.config16
-rw-r--r--kernel-ppc64.config16
-rw-r--r--kernel-ppc64le-debug.config16
-rw-r--r--kernel-ppc64le.config16
-rw-r--r--kernel-ppc64p7-debug.config16
-rw-r--r--kernel-ppc64p7.config16
-rw-r--r--kernel-s390x-debug.config12
-rw-r--r--kernel-s390x.config12
-rw-r--r--kernel-x86_64-debug.config1
-rw-r--r--kernel-x86_64.config1
-rw-r--r--kernel.spec3
42 files changed, 43 insertions, 185 deletions
diff --git a/baseconfig/CONFIG_I2C_PARPORT_LIGHT b/baseconfig/CONFIG_I2C_PARPORT_LIGHT
index 1dbc68883..e18239222 100644
--- a/baseconfig/CONFIG_I2C_PARPORT_LIGHT
+++ b/baseconfig/CONFIG_I2C_PARPORT_LIGHT
@@ -1 +1 @@
-CONFIG_I2C_PARPORT_LIGHT=m
+# CONFIG_I2C_PARPORT_LIGHT is not set
diff --git a/baseconfig/CONFIG_PARPORT b/baseconfig/CONFIG_PARPORT
index 589156958..9dd8f33af 100644
--- a/baseconfig/CONFIG_PARPORT
+++ b/baseconfig/CONFIG_PARPORT
@@ -1 +1 @@
-CONFIG_PARPORT=m
+# CONFIG_PARPORT is not set
diff --git a/baseconfig/CONFIG_PARPORT_PC b/baseconfig/CONFIG_PARPORT_PC
index b9aa6e8ca..e2a0d3656 100644
--- a/baseconfig/CONFIG_PARPORT_PC
+++ b/baseconfig/CONFIG_PARPORT_PC
@@ -1 +1 @@
-CONFIG_PARPORT_PC=m
+# CONFIG_PARPORT_PC is not set
diff --git a/baseconfig/CONFIG_PPS_GENERATOR_PARPORT b/baseconfig/CONFIG_PPS_GENERATOR_PARPORT
deleted file mode 100644
index 10f4eca68..000000000
--- a/baseconfig/CONFIG_PPS_GENERATOR_PARPORT
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_PPS_GENERATOR_PARPORT=m
diff --git a/baseconfig/arm/CONFIG_PARPORT b/baseconfig/arm/CONFIG_PARPORT
deleted file mode 100644
index 9dd8f33af..000000000
--- a/baseconfig/arm/CONFIG_PARPORT
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_PARPORT is not set
diff --git a/baseconfig/arm/arm64/CONFIG_PARPORT_PC b/baseconfig/arm/arm64/CONFIG_PARPORT_PC
deleted file mode 100644
index e2a0d3656..000000000
--- a/baseconfig/arm/arm64/CONFIG_PARPORT_PC
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_PARPORT_PC is not set
diff --git a/baseconfig/s390x/CONFIG_I2C_PARPORT b/baseconfig/s390x/CONFIG_I2C_PARPORT
deleted file mode 100644
index 87b55caf2..000000000
--- a/baseconfig/s390x/CONFIG_I2C_PARPORT
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_I2C_PARPORT is not set
diff --git a/baseconfig/s390x/CONFIG_I2C_PARPORT_LIGHT b/baseconfig/s390x/CONFIG_I2C_PARPORT_LIGHT
deleted file mode 100644
index e18239222..000000000
--- a/baseconfig/s390x/CONFIG_I2C_PARPORT_LIGHT
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_I2C_PARPORT_LIGHT is not set
diff --git a/baseconfig/s390x/CONFIG_PARPORT b/baseconfig/s390x/CONFIG_PARPORT
deleted file mode 100644
index 9dd8f33af..000000000
--- a/baseconfig/s390x/CONFIG_PARPORT
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_PARPORT is not set
diff --git a/baseconfig/CONFIG_I2C_PARPORT b/baseconfig/x86/CONFIG_I2C_PARPORT
index 58827a258..58827a258 100644
--- a/baseconfig/CONFIG_I2C_PARPORT
+++ b/baseconfig/x86/CONFIG_I2C_PARPORT
diff --git a/baseconfig/x86/CONFIG_I2C_PARPORT_LIGHT b/baseconfig/x86/CONFIG_I2C_PARPORT_LIGHT
new file mode 100644
index 000000000..1dbc68883
--- /dev/null
+++ b/baseconfig/x86/CONFIG_I2C_PARPORT_LIGHT
@@ -0,0 +1 @@
+CONFIG_I2C_PARPORT_LIGHT=m
diff --git a/baseconfig/x86/CONFIG_PARPORT b/baseconfig/x86/CONFIG_PARPORT
new file mode 100644
index 000000000..589156958
--- /dev/null
+++ b/baseconfig/x86/CONFIG_PARPORT
@@ -0,0 +1 @@
+CONFIG_PARPORT=m
diff --git a/baseconfig/CONFIG_PARPORT_1284 b/baseconfig/x86/CONFIG_PARPORT_1284
index 585684fb0..585684fb0 100644
--- a/baseconfig/CONFIG_PARPORT_1284
+++ b/baseconfig/x86/CONFIG_PARPORT_1284
diff --git a/baseconfig/CONFIG_PARPORT_AX88796 b/baseconfig/x86/CONFIG_PARPORT_AX88796
index 6214b2b8c..6214b2b8c 100644
--- a/baseconfig/CONFIG_PARPORT_AX88796
+++ b/baseconfig/x86/CONFIG_PARPORT_AX88796
diff --git a/baseconfig/x86/CONFIG_PARPORT_PC b/baseconfig/x86/CONFIG_PARPORT_PC
new file mode 100644
index 000000000..b9aa6e8ca
--- /dev/null
+++ b/baseconfig/x86/CONFIG_PARPORT_PC
@@ -0,0 +1 @@
+CONFIG_PARPORT_PC=m
diff --git a/baseconfig/CONFIG_PARPORT_PC_FIFO b/baseconfig/x86/CONFIG_PARPORT_PC_FIFO
index 62562af4c..62562af4c 100644
--- a/baseconfig/CONFIG_PARPORT_PC_FIFO
+++ b/baseconfig/x86/CONFIG_PARPORT_PC_FIFO
diff --git a/baseconfig/CONFIG_PARPORT_PC_PCMCIA b/baseconfig/x86/CONFIG_PARPORT_PC_PCMCIA
index cae4b9a2a..cae4b9a2a 100644
--- a/baseconfig/CONFIG_PARPORT_PC_PCMCIA
+++ b/baseconfig/x86/CONFIG_PARPORT_PC_PCMCIA
diff --git a/baseconfig/CONFIG_PARPORT_PC_SUPERIO b/baseconfig/x86/CONFIG_PARPORT_PC_SUPERIO
index b6858ce79..b6858ce79 100644
--- a/baseconfig/CONFIG_PARPORT_PC_SUPERIO
+++ b/baseconfig/x86/CONFIG_PARPORT_PC_SUPERIO
diff --git a/baseconfig/CONFIG_PARPORT_SERIAL b/baseconfig/x86/CONFIG_PARPORT_SERIAL
index 8e9020190..8e9020190 100644
--- a/baseconfig/CONFIG_PARPORT_SERIAL
+++ b/baseconfig/x86/CONFIG_PARPORT_SERIAL
diff --git a/baseconfig/CONFIG_PPS_CLIENT_PARPORT b/baseconfig/x86/CONFIG_PPS_CLIENT_PARPORT
index d11894def..d11894def 100644
--- a/baseconfig/CONFIG_PPS_CLIENT_PARPORT
+++ b/baseconfig/x86/CONFIG_PPS_CLIENT_PARPORT
diff --git a/baseconfig/CONFIG_USB_SERIAL_MOS7715_PARPORT b/baseconfig/x86/CONFIG_USB_SERIAL_MOS7715_PARPORT
index 87be7826c..87be7826c 100644
--- a/baseconfig/CONFIG_USB_SERIAL_MOS7715_PARPORT
+++ b/baseconfig/x86/CONFIG_USB_SERIAL_MOS7715_PARPORT
diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config
index 0eaa71e58..6fc8e76f5 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -2035,8 +2035,7 @@ CONFIG_I2C_NFORCE2=m
# CONFIG_I2C_NFORCE2_S4985 is not set
# CONFIG_I2C_NOMADIK is not set
# CONFIG_I2C_OCORES is not set
-CONFIG_I2C_PARPORT_LIGHT=m
-CONFIG_I2C_PARPORT=m
+# CONFIG_I2C_PARPORT_LIGHT is not set
CONFIG_I2C_PCA_PLATFORM=m
# CONFIG_I2C_PIIX4 is not set
CONFIG_I2C_PXA=m
@@ -3880,14 +3879,8 @@ CONFIG_PARAVIRT_TIME_ACCOUNTING=y
CONFIG_PARAVIRT=y
# CONFIG_PARIDE is not set
CONFIG_PARMAN=m
-CONFIG_PARPORT_1284=y
-# CONFIG_PARPORT_AX88796 is not set
# CONFIG_PARPORT is not set
-# CONFIG_PARPORT_PC_FIFO is not set
# CONFIG_PARPORT_PC is not set
-CONFIG_PARPORT_PC_PCMCIA=m
-# CONFIG_PARPORT_PC_SUPERIO is not set
-CONFIG_PARPORT_SERIAL=m
CONFIG_PARTITION_ADVANCED=y
CONFIG_PATA_ACPI=m
CONFIG_PATA_ALI=m
@@ -4138,9 +4131,7 @@ CONFIG_PPP_SYNC_TTY=m
CONFIG_PPS_CLIENT_GPIO=m
# CONFIG_PPS_CLIENT_KTIMER is not set
CONFIG_PPS_CLIENT_LDISC=m
-CONFIG_PPS_CLIENT_PARPORT=m
# CONFIG_PPS_DEBUG is not set
-CONFIG_PPS_GENERATOR_PARPORT=m
CONFIG_PPS=m
CONFIG_PPTP=m
# CONFIG_PREEMPT is not set
@@ -6076,7 +6067,6 @@ CONFIG_USB_SERIAL_KLSI=m
CONFIG_USB_SERIAL_KOBIL_SCT=m
CONFIG_USB_SERIAL_MCT_U232=m
# CONFIG_USB_SERIAL_METRO is not set
-CONFIG_USB_SERIAL_MOS7715_PARPORT=y
CONFIG_USB_SERIAL_MOS7720=m
CONFIG_USB_SERIAL_MOS7840=m
# CONFIG_USB_SERIAL_MXUPORT is not set
diff --git a/kernel-aarch64.config b/kernel-aarch64.config
index 47a36a9dc..ff26f1ace 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -2018,8 +2018,7 @@ CONFIG_I2C_NFORCE2=m
# CONFIG_I2C_NFORCE2_S4985 is not set
# CONFIG_I2C_NOMADIK is not set
# CONFIG_I2C_OCORES is not set
-CONFIG_I2C_PARPORT_LIGHT=m
-CONFIG_I2C_PARPORT=m
+# CONFIG_I2C_PARPORT_LIGHT is not set
CONFIG_I2C_PCA_PLATFORM=m
# CONFIG_I2C_PIIX4 is not set
CONFIG_I2C_PXA=m
@@ -3859,14 +3858,8 @@ CONFIG_PARAVIRT_TIME_ACCOUNTING=y
CONFIG_PARAVIRT=y
# CONFIG_PARIDE is not set
CONFIG_PARMAN=m
-CONFIG_PARPORT_1284=y
-# CONFIG_PARPORT_AX88796 is not set
# CONFIG_PARPORT is not set
-# CONFIG_PARPORT_PC_FIFO is not set
# CONFIG_PARPORT_PC is not set
-CONFIG_PARPORT_PC_PCMCIA=m
-# CONFIG_PARPORT_PC_SUPERIO is not set
-CONFIG_PARPORT_SERIAL=m
CONFIG_PARTITION_ADVANCED=y
CONFIG_PATA_ACPI=m
CONFIG_PATA_ALI=m
@@ -4117,9 +4110,7 @@ CONFIG_PPP_SYNC_TTY=m
CONFIG_PPS_CLIENT_GPIO=m
# CONFIG_PPS_CLIENT_KTIMER is not set
CONFIG_PPS_CLIENT_LDISC=m
-CONFIG_PPS_CLIENT_PARPORT=m
# CONFIG_PPS_DEBUG is not set
-CONFIG_PPS_GENERATOR_PARPORT=m
CONFIG_PPS=m
CONFIG_PPTP=m
# CONFIG_PREEMPT is not set
@@ -6053,7 +6044,6 @@ CONFIG_USB_SERIAL_KLSI=m
CONFIG_USB_SERIAL_KOBIL_SCT=m
CONFIG_USB_SERIAL_MCT_U232=m
# CONFIG_USB_SERIAL_METRO is not set
-CONFIG_USB_SERIAL_MOS7715_PARPORT=y
CONFIG_USB_SERIAL_MOS7720=m
CONFIG_USB_SERIAL_MOS7840=m
# CONFIG_USB_SERIAL_MXUPORT is not set
diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config
index 2f7d9c727..96dd0ac81 100644
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@@ -2173,8 +2173,7 @@ CONFIG_I2C_NFORCE2=m
# CONFIG_I2C_NOMADIK is not set
# CONFIG_I2C_OCORES is not set
CONFIG_I2C_OMAP=y
-CONFIG_I2C_PARPORT_LIGHT=m
-CONFIG_I2C_PARPORT=m
+# CONFIG_I2C_PARPORT_LIGHT is not set
CONFIG_I2C_PCA_PLATFORM=m
# CONFIG_I2C_PIIX4 is not set
CONFIG_I2C_PXA=m
@@ -4167,14 +4166,8 @@ CONFIG_PARAVIRT_TIME_ACCOUNTING=y
CONFIG_PARAVIRT=y
# CONFIG_PARIDE is not set
CONFIG_PARMAN=m
-CONFIG_PARPORT_1284=y
-# CONFIG_PARPORT_AX88796 is not set
# CONFIG_PARPORT is not set
-# CONFIG_PARPORT_PC_FIFO is not set
-CONFIG_PARPORT_PC=m
-CONFIG_PARPORT_PC_PCMCIA=m
-# CONFIG_PARPORT_PC_SUPERIO is not set
-CONFIG_PARPORT_SERIAL=m
+# CONFIG_PARPORT_PC is not set
CONFIG_PARTITION_ADVANCED=y
CONFIG_PATA_ACPI=m
CONFIG_PATA_ALI=m
@@ -4449,9 +4442,7 @@ CONFIG_PPP_SYNC_TTY=m
CONFIG_PPS_CLIENT_GPIO=m
# CONFIG_PPS_CLIENT_KTIMER is not set
CONFIG_PPS_CLIENT_LDISC=m
-CONFIG_PPS_CLIENT_PARPORT=m
# CONFIG_PPS_DEBUG is not set
-CONFIG_PPS_GENERATOR_PARPORT=m
CONFIG_PPS=m
CONFIG_PPTP=m
# CONFIG_PREEMPT is not set
@@ -5703,6 +5694,7 @@ CONFIG_SND_SOC_STORM=m
# CONFIG_SND_SOC_TAS5720 is not set
CONFIG_SND_SOC_TEGRA20_AC97=m
CONFIG_SND_SOC_TEGRA20_DAS=m
+CONFIG_SND_SOC_TEGRA20_I2S=m
CONFIG_SND_SOC_TEGRA20_SPDIF=m
CONFIG_SND_SOC_TEGRA30_AHUB=m
CONFIG_SND_SOC_TEGRA30_I2S=m
@@ -6605,7 +6597,6 @@ CONFIG_USB_SERIAL_KLSI=m
CONFIG_USB_SERIAL_KOBIL_SCT=m
CONFIG_USB_SERIAL_MCT_U232=m
# CONFIG_USB_SERIAL_METRO is not set
-CONFIG_USB_SERIAL_MOS7715_PARPORT=y
CONFIG_USB_SERIAL_MOS7720=m
CONFIG_USB_SERIAL_MOS7840=m
# CONFIG_USB_SERIAL_MXUPORT is not set
diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config
index caf7f36ed..1977b34f3 100644
--- a/kernel-armv7hl-lpae-debug.config
+++ b/kernel-armv7hl-lpae-debug.config
@@ -2063,8 +2063,7 @@ CONFIG_I2C_NFORCE2=m
# CONFIG_I2C_NFORCE2_S4985 is not set
# CONFIG_I2C_NOMADIK is not set
# CONFIG_I2C_OCORES is not set
-CONFIG_I2C_PARPORT_LIGHT=m
-CONFIG_I2C_PARPORT=m
+# CONFIG_I2C_PARPORT_LIGHT is not set
CONFIG_I2C_PCA_PLATFORM=m
# CONFIG_I2C_PIIX4 is not set
CONFIG_I2C_PXA=m
@@ -3954,14 +3953,8 @@ CONFIG_PARAVIRT_TIME_ACCOUNTING=y
CONFIG_PARAVIRT=y
# CONFIG_PARIDE is not set
CONFIG_PARMAN=m
-CONFIG_PARPORT_1284=y
-# CONFIG_PARPORT_AX88796 is not set
# CONFIG_PARPORT is not set
-# CONFIG_PARPORT_PC_FIFO is not set
-CONFIG_PARPORT_PC=m
-CONFIG_PARPORT_PC_PCMCIA=m
-# CONFIG_PARPORT_PC_SUPERIO is not set
-CONFIG_PARPORT_SERIAL=m
+# CONFIG_PARPORT_PC is not set
CONFIG_PARTITION_ADVANCED=y
CONFIG_PATA_ACPI=m
CONFIG_PATA_ALI=m
@@ -4209,9 +4202,7 @@ CONFIG_PPP_SYNC_TTY=m
CONFIG_PPS_CLIENT_GPIO=m
# CONFIG_PPS_CLIENT_KTIMER is not set
CONFIG_PPS_CLIENT_LDISC=m
-CONFIG_PPS_CLIENT_PARPORT=m
# CONFIG_PPS_DEBUG is not set
-CONFIG_PPS_GENERATOR_PARPORT=m
CONFIG_PPS=m
CONFIG_PPTP=m
# CONFIG_PREEMPT is not set
@@ -5346,6 +5337,7 @@ CONFIG_SND_SOC_SPDIF=m
# CONFIG_SND_SOC_TAS5720 is not set
# CONFIG_SND_SOC_TEGRA20_AC97 is not set
# CONFIG_SND_SOC_TEGRA20_DAS is not set
+CONFIG_SND_SOC_TEGRA20_I2S=m
# CONFIG_SND_SOC_TEGRA20_SPDIF is not set
CONFIG_SND_SOC_TEGRA30_AHUB=m
CONFIG_SND_SOC_TEGRA30_I2S=m
@@ -6175,7 +6167,6 @@ CONFIG_USB_SERIAL_KLSI=m
CONFIG_USB_SERIAL_KOBIL_SCT=m
CONFIG_USB_SERIAL_MCT_U232=m
# CONFIG_USB_SERIAL_METRO is not set
-CONFIG_USB_SERIAL_MOS7715_PARPORT=y
CONFIG_USB_SERIAL_MOS7720=m
CONFIG_USB_SERIAL_MOS7840=m
# CONFIG_USB_SERIAL_MXUPORT is not set
diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config
index c82577254..8e9374768 100644
--- a/kernel-armv7hl-lpae.config
+++ b/kernel-armv7hl-lpae.config
@@ -2046,8 +2046,7 @@ CONFIG_I2C_NFORCE2=m
# CONFIG_I2C_NFORCE2_S4985 is not set
# CONFIG_I2C_NOMADIK is not set
# CONFIG_I2C_OCORES is not set
-CONFIG_I2C_PARPORT_LIGHT=m
-CONFIG_I2C_PARPORT=m
+# CONFIG_I2C_PARPORT_LIGHT is not set
CONFIG_I2C_PCA_PLATFORM=m
# CONFIG_I2C_PIIX4 is not set
CONFIG_I2C_PXA=m
@@ -3933,14 +3932,8 @@ CONFIG_PARAVIRT_TIME_ACCOUNTING=y
CONFIG_PARAVIRT=y
# CONFIG_PARIDE is not set
CONFIG_PARMAN=m
-CONFIG_PARPORT_1284=y
-# CONFIG_PARPORT_AX88796 is not set
# CONFIG_PARPORT is not set
-# CONFIG_PARPORT_PC_FIFO is not set
-CONFIG_PARPORT_PC=m
-CONFIG_PARPORT_PC_PCMCIA=m
-# CONFIG_PARPORT_PC_SUPERIO is not set
-CONFIG_PARPORT_SERIAL=m
+# CONFIG_PARPORT_PC is not set
CONFIG_PARTITION_ADVANCED=y
CONFIG_PATA_ACPI=m
CONFIG_PATA_ALI=m
@@ -4188,9 +4181,7 @@ CONFIG_PPP_SYNC_TTY=m
CONFIG_PPS_CLIENT_GPIO=m
# CONFIG_PPS_CLIENT_KTIMER is not set
CONFIG_PPS_CLIENT_LDISC=m
-CONFIG_PPS_CLIENT_PARPORT=m
# CONFIG_PPS_DEBUG is not set
-CONFIG_PPS_GENERATOR_PARPORT=m
CONFIG_PPS=m
CONFIG_PPTP=m
# CONFIG_PREEMPT is not set
@@ -5323,6 +5314,7 @@ CONFIG_SND_SOC_SPDIF=m
# CONFIG_SND_SOC_TAS5720 is not set
# CONFIG_SND_SOC_TEGRA20_AC97 is not set
# CONFIG_SND_SOC_TEGRA20_DAS is not set
+CONFIG_SND_SOC_TEGRA20_I2S=m
# CONFIG_SND_SOC_TEGRA20_SPDIF is not set
CONFIG_SND_SOC_TEGRA30_AHUB=m
CONFIG_SND_SOC_TEGRA30_I2S=m
@@ -6152,7 +6144,6 @@ CONFIG_USB_SERIAL_KLSI=m
CONFIG_USB_SERIAL_KOBIL_SCT=m
CONFIG_USB_SERIAL_MCT_U232=m
# CONFIG_USB_SERIAL_METRO is not set
-CONFIG_USB_SERIAL_MOS7715_PARPORT=y
CONFIG_USB_SERIAL_MOS7720=m
CONFIG_USB_SERIAL_MOS7840=m
# CONFIG_USB_SERIAL_MXUPORT is not set
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config
index 4a1da02ef..852fdead3 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -2156,8 +2156,7 @@ CONFIG_I2C_NFORCE2=m
# CONFIG_I2C_NOMADIK is not set
# CONFIG_I2C_OCORES is not set
CONFIG_I2C_OMAP=y
-CONFIG_I2C_PARPORT_LIGHT=m
-CONFIG_I2C_PARPORT=m
+# CONFIG_I2C_PARPORT_LIGHT is not set
CONFIG_I2C_PCA_PLATFORM=m
# CONFIG_I2C_PIIX4 is not set
CONFIG_I2C_PXA=m
@@ -4146,14 +4145,8 @@ CONFIG_PARAVIRT_TIME_ACCOUNTING=y
CONFIG_PARAVIRT=y
# CONFIG_PARIDE is not set
CONFIG_PARMAN=m
-CONFIG_PARPORT_1284=y
-# CONFIG_PARPORT_AX88796 is not set
# CONFIG_PARPORT is not set
-# CONFIG_PARPORT_PC_FIFO is not set
-CONFIG_PARPORT_PC=m
-CONFIG_PARPORT_PC_PCMCIA=m
-# CONFIG_PARPORT_PC_SUPERIO is not set
-CONFIG_PARPORT_SERIAL=m
+# CONFIG_PARPORT_PC is not set
CONFIG_PARTITION_ADVANCED=y
CONFIG_PATA_ACPI=m
CONFIG_PATA_ALI=m
@@ -4428,9 +4421,7 @@ CONFIG_PPP_SYNC_TTY=m
CONFIG_PPS_CLIENT_GPIO=m
# CONFIG_PPS_CLIENT_KTIMER is not set
CONFIG_PPS_CLIENT_LDISC=m
-CONFIG_PPS_CLIENT_PARPORT=m
# CONFIG_PPS_DEBUG is not set
-CONFIG_PPS_GENERATOR_PARPORT=m
CONFIG_PPS=m
CONFIG_PPTP=m
# CONFIG_PREEMPT is not set
@@ -5680,6 +5671,7 @@ CONFIG_SND_SOC_STORM=m
# CONFIG_SND_SOC_TAS5720 is not set
CONFIG_SND_SOC_TEGRA20_AC97=m
CONFIG_SND_SOC_TEGRA20_DAS=m
+CONFIG_SND_SOC_TEGRA20_I2S=m
CONFIG_SND_SOC_TEGRA20_SPDIF=m
CONFIG_SND_SOC_TEGRA30_AHUB=m
CONFIG_SND_SOC_TEGRA30_I2S=m
@@ -6582,7 +6574,6 @@ CONFIG_USB_SERIAL_KLSI=m
CONFIG_USB_SERIAL_KOBIL_SCT=m
CONFIG_USB_SERIAL_MCT_U232=m
# CONFIG_USB_SERIAL_METRO is not set
-CONFIG_USB_SERIAL_MOS7715_PARPORT=y
CONFIG_USB_SERIAL_MOS7720=m
CONFIG_USB_SERIAL_MOS7840=m
# CONFIG_USB_SERIAL_MXUPORT is not set
diff --git a/kernel-i686-PAE.config b/kernel-i686-PAE.config
index b7a9c232a..52a2c1ca9 100644
--- a/kernel-i686-PAE.config
+++ b/kernel-i686-PAE.config
@@ -3958,7 +3958,6 @@ CONFIG_PPS_CLIENT_GPIO=m
CONFIG_PPS_CLIENT_LDISC=m
CONFIG_PPS_CLIENT_PARPORT=m
# CONFIG_PPS_DEBUG is not set
-CONFIG_PPS_GENERATOR_PARPORT=m
CONFIG_PPS=m
CONFIG_PPTP=m
# CONFIG_PREEMPT is not set
diff --git a/kernel-i686-PAEdebug.config b/kernel-i686-PAEdebug.config
index 19ce6883e..ef80c5812 100644
--- a/kernel-i686-PAEdebug.config
+++ b/kernel-i686-PAEdebug.config
@@ -3978,7 +3978,6 @@ CONFIG_PPS_CLIENT_GPIO=m
CONFIG_PPS_CLIENT_LDISC=m
CONFIG_PPS_CLIENT_PARPORT=m
# CONFIG_PPS_DEBUG is not set
-CONFIG_PPS_GENERATOR_PARPORT=m
CONFIG_PPS=m
CONFIG_PPTP=m
# CONFIG_PREEMPT is not set
diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config
index b9e6a3926..c01104593 100644
--- a/kernel-i686-debug.config
+++ b/kernel-i686-debug.config
@@ -3978,7 +3978,6 @@ CONFIG_PPS_CLIENT_GPIO=m
CONFIG_PPS_CLIENT_LDISC=m
CONFIG_PPS_CLIENT_PARPORT=m
# CONFIG_PPS_DEBUG is not set
-CONFIG_PPS_GENERATOR_PARPORT=m
CONFIG_PPS=m
CONFIG_PPTP=m
# CONFIG_PREEMPT is not set
diff --git a/kernel-i686.config b/kernel-i686.config
index e9c919983..1b92c6a49 100644
--- a/kernel-i686.config
+++ b/kernel-i686.config
@@ -3958,7 +3958,6 @@ CONFIG_PPS_CLIENT_GPIO=m
CONFIG_PPS_CLIENT_LDISC=m
CONFIG_PPS_CLIENT_PARPORT=m
# CONFIG_PPS_DEBUG is not set
-CONFIG_PPS_GENERATOR_PARPORT=m
CONFIG_PPS=m
CONFIG_PPTP=m
# CONFIG_PREEMPT is not set
diff --git a/kernel-ppc64-debug.config b/kernel-ppc64-debug.config
index 3f5b1379e..da5951c32 100644
--- a/kernel-ppc64-debug.config
+++ b/kernel-ppc64-debug.config
@@ -1825,8 +1825,7 @@ CONFIG_I2C_NFORCE2=m
# CONFIG_I2C_NFORCE2_S4985 is not set
# CONFIG_I2C_OCORES is not set
CONFIG_I2C_OPAL=m
-CONFIG_I2C_PARPORT_LIGHT=m
-CONFIG_I2C_PARPORT=m
+# CONFIG_I2C_PARPORT_LIGHT is not set
CONFIG_I2C_PCA_PLATFORM=m
# CONFIG_I2C_PIIX4 is not set
CONFIG_I2C_POWERMAC=m
@@ -3578,14 +3577,8 @@ CONFIG_PANIC_TIMEOUT=0
CONFIG_PANTHERLORD_FF=y
# CONFIG_PARIDE is not set
CONFIG_PARMAN=m
-CONFIG_PARPORT_1284=y
-# CONFIG_PARPORT_AX88796 is not set
-CONFIG_PARPORT=m
-# CONFIG_PARPORT_PC_FIFO is not set
-CONFIG_PARPORT_PC=m
-CONFIG_PARPORT_PC_PCMCIA=m
-# CONFIG_PARPORT_PC_SUPERIO is not set
-CONFIG_PARPORT_SERIAL=m
+# CONFIG_PARPORT is not set
+# CONFIG_PARPORT_PC is not set
CONFIG_PARTITION_ADVANCED=y
CONFIG_PATA_ACPI=m
CONFIG_PATA_ALI=m
@@ -3804,9 +3797,7 @@ CONFIG_PPP_SYNC_TTY=m
CONFIG_PPS_CLIENT_GPIO=m
# CONFIG_PPS_CLIENT_KTIMER is not set
CONFIG_PPS_CLIENT_LDISC=m
-CONFIG_PPS_CLIENT_PARPORT=m
# CONFIG_PPS_DEBUG is not set
-CONFIG_PPS_GENERATOR_PARPORT=m
CONFIG_PPS=m
CONFIG_PPTP=m
# CONFIG_PREEMPT is not set
@@ -5497,7 +5488,6 @@ CONFIG_USB_SERIAL_KLSI=m
CONFIG_USB_SERIAL_KOBIL_SCT=m
CONFIG_USB_SERIAL_MCT_U232=m
# CONFIG_USB_SERIAL_METRO is not set
-CONFIG_USB_SERIAL_MOS7715_PARPORT=y
CONFIG_USB_SERIAL_MOS7720=m
CONFIG_USB_SERIAL_MOS7840=m
# CONFIG_USB_SERIAL_MXUPORT is not set
diff --git a/kernel-ppc64.config b/kernel-ppc64.config
index 915cdedf9..4df97c451 100644
--- a/kernel-ppc64.config
+++ b/kernel-ppc64.config
@@ -1807,8 +1807,7 @@ CONFIG_I2C_NFORCE2=m
# CONFIG_I2C_NFORCE2_S4985 is not set
# CONFIG_I2C_OCORES is not set
CONFIG_I2C_OPAL=m
-CONFIG_I2C_PARPORT_LIGHT=m
-CONFIG_I2C_PARPORT=m
+# CONFIG_I2C_PARPORT_LIGHT is not set
CONFIG_I2C_PCA_PLATFORM=m
# CONFIG_I2C_PIIX4 is not set
CONFIG_I2C_POWERMAC=m
@@ -3556,14 +3555,8 @@ CONFIG_PANIC_TIMEOUT=0
CONFIG_PANTHERLORD_FF=y
# CONFIG_PARIDE is not set
CONFIG_PARMAN=m
-CONFIG_PARPORT_1284=y
-# CONFIG_PARPORT_AX88796 is not set
-CONFIG_PARPORT=m
-# CONFIG_PARPORT_PC_FIFO is not set
-CONFIG_PARPORT_PC=m
-CONFIG_PARPORT_PC_PCMCIA=m
-# CONFIG_PARPORT_PC_SUPERIO is not set
-CONFIG_PARPORT_SERIAL=m
+# CONFIG_PARPORT is not set
+# CONFIG_PARPORT_PC is not set
CONFIG_PARTITION_ADVANCED=y
CONFIG_PATA_ACPI=m
CONFIG_PATA_ALI=m
@@ -3782,9 +3775,7 @@ CONFIG_PPP_SYNC_TTY=m
CONFIG_PPS_CLIENT_GPIO=m
# CONFIG_PPS_CLIENT_KTIMER is not set
CONFIG_PPS_CLIENT_LDISC=m
-CONFIG_PPS_CLIENT_PARPORT=m
# CONFIG_PPS_DEBUG is not set
-CONFIG_PPS_GENERATOR_PARPORT=m
CONFIG_PPS=m
CONFIG_PPTP=m
# CONFIG_PREEMPT is not set
@@ -5473,7 +5464,6 @@ CONFIG_USB_SERIAL_KLSI=m
CONFIG_USB_SERIAL_KOBIL_SCT=m
CONFIG_USB_SERIAL_MCT_U232=m
# CONFIG_USB_SERIAL_METRO is not set
-CONFIG_USB_SERIAL_MOS7715_PARPORT=y
CONFIG_USB_SERIAL_MOS7720=m
CONFIG_USB_SERIAL_MOS7840=m
# CONFIG_USB_SERIAL_MXUPORT is not set
diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config
index c370527a6..9171912e9 100644
--- a/kernel-ppc64le-debug.config
+++ b/kernel-ppc64le-debug.config
@@ -1778,8 +1778,7 @@ CONFIG_I2C_NFORCE2=m
# CONFIG_I2C_NFORCE2_S4985 is not set
# CONFIG_I2C_OCORES is not set
CONFIG_I2C_OPAL=m
-CONFIG_I2C_PARPORT_LIGHT=m
-CONFIG_I2C_PARPORT=m
+# CONFIG_I2C_PARPORT_LIGHT is not set
CONFIG_I2C_PCA_PLATFORM=m
# CONFIG_I2C_PIIX4 is not set
# CONFIG_I2C_RK3X is not set
@@ -3523,14 +3522,8 @@ CONFIG_PANIC_TIMEOUT=0
CONFIG_PANTHERLORD_FF=y
# CONFIG_PARIDE is not set
CONFIG_PARMAN=m
-CONFIG_PARPORT_1284=y
-# CONFIG_PARPORT_AX88796 is not set
-CONFIG_PARPORT=m
-# CONFIG_PARPORT_PC_FIFO is not set
-CONFIG_PARPORT_PC=m
-CONFIG_PARPORT_PC_PCMCIA=m
-# CONFIG_PARPORT_PC_SUPERIO is not set
-CONFIG_PARPORT_SERIAL=m
+# CONFIG_PARPORT is not set
+# CONFIG_PARPORT_PC is not set
CONFIG_PARTITION_ADVANCED=y
CONFIG_PATA_ACPI=m
CONFIG_PATA_ALI=m
@@ -3744,9 +3737,7 @@ CONFIG_PPP_SYNC_TTY=m
CONFIG_PPS_CLIENT_GPIO=m
# CONFIG_PPS_CLIENT_KTIMER is not set
CONFIG_PPS_CLIENT_LDISC=m
-CONFIG_PPS_CLIENT_PARPORT=m
# CONFIG_PPS_DEBUG is not set
-CONFIG_PPS_GENERATOR_PARPORT=m
CONFIG_PPS=m
CONFIG_PPTP=m
# CONFIG_PREEMPT is not set
@@ -5426,7 +5417,6 @@ CONFIG_USB_SERIAL_KLSI=m
CONFIG_USB_SERIAL_KOBIL_SCT=m
CONFIG_USB_SERIAL_MCT_U232=m
# CONFIG_USB_SERIAL_METRO is not set
-CONFIG_USB_SERIAL_MOS7715_PARPORT=y
CONFIG_USB_SERIAL_MOS7720=m
CONFIG_USB_SERIAL_MOS7840=m
# CONFIG_USB_SERIAL_MXUPORT is not set
diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config
index 7fce767f1..95ce5a0ee 100644
--- a/kernel-ppc64le.config
+++ b/kernel-ppc64le.config
@@ -1760,8 +1760,7 @@ CONFIG_I2C_NFORCE2=m
# CONFIG_I2C_NFORCE2_S4985 is not set
# CONFIG_I2C_OCORES is not set
CONFIG_I2C_OPAL=m
-CONFIG_I2C_PARPORT_LIGHT=m
-CONFIG_I2C_PARPORT=m
+# CONFIG_I2C_PARPORT_LIGHT is not set
CONFIG_I2C_PCA_PLATFORM=m
# CONFIG_I2C_PIIX4 is not set
# CONFIG_I2C_RK3X is not set
@@ -3501,14 +3500,8 @@ CONFIG_PANIC_TIMEOUT=0
CONFIG_PANTHERLORD_FF=y
# CONFIG_PARIDE is not set
CONFIG_PARMAN=m
-CONFIG_PARPORT_1284=y
-# CONFIG_PARPORT_AX88796 is not set
-CONFIG_PARPORT=m
-# CONFIG_PARPORT_PC_FIFO is not set
-CONFIG_PARPORT_PC=m
-CONFIG_PARPORT_PC_PCMCIA=m
-# CONFIG_PARPORT_PC_SUPERIO is not set
-CONFIG_PARPORT_SERIAL=m
+# CONFIG_PARPORT is not set
+# CONFIG_PARPORT_PC is not set
CONFIG_PARTITION_ADVANCED=y
CONFIG_PATA_ACPI=m
CONFIG_PATA_ALI=m
@@ -3722,9 +3715,7 @@ CONFIG_PPP_SYNC_TTY=m
CONFIG_PPS_CLIENT_GPIO=m
# CONFIG_PPS_CLIENT_KTIMER is not set
CONFIG_PPS_CLIENT_LDISC=m
-CONFIG_PPS_CLIENT_PARPORT=m
# CONFIG_PPS_DEBUG is not set
-CONFIG_PPS_GENERATOR_PARPORT=m
CONFIG_PPS=m
CONFIG_PPTP=m
# CONFIG_PREEMPT is not set
@@ -5402,7 +5393,6 @@ CONFIG_USB_SERIAL_KLSI=m
CONFIG_USB_SERIAL_KOBIL_SCT=m
CONFIG_USB_SERIAL_MCT_U232=m
# CONFIG_USB_SERIAL_METRO is not set
-CONFIG_USB_SERIAL_MOS7715_PARPORT=y
CONFIG_USB_SERIAL_MOS7720=m
CONFIG_USB_SERIAL_MOS7840=m
# CONFIG_USB_SERIAL_MXUPORT is not set
diff --git a/kernel-ppc64p7-debug.config b/kernel-ppc64p7-debug.config
index 1c0c9440c..ad638cfee 100644
--- a/kernel-ppc64p7-debug.config
+++ b/kernel-ppc64p7-debug.config
@@ -1777,8 +1777,7 @@ CONFIG_I2C_NFORCE2=m
# CONFIG_I2C_NFORCE2_S4985 is not set
# CONFIG_I2C_OCORES is not set
CONFIG_I2C_OPAL=m
-CONFIG_I2C_PARPORT_LIGHT=m
-CONFIG_I2C_PARPORT=m
+# CONFIG_I2C_PARPORT_LIGHT is not set
CONFIG_I2C_PCA_PLATFORM=m
# CONFIG_I2C_PIIX4 is not set
# CONFIG_I2C_RK3X is not set
@@ -3522,14 +3521,8 @@ CONFIG_PANIC_TIMEOUT=0
CONFIG_PANTHERLORD_FF=y
# CONFIG_PARIDE is not set
CONFIG_PARMAN=m
-CONFIG_PARPORT_1284=y
-# CONFIG_PARPORT_AX88796 is not set
-CONFIG_PARPORT=m
-# CONFIG_PARPORT_PC_FIFO is not set
-CONFIG_PARPORT_PC=m
-CONFIG_PARPORT_PC_PCMCIA=m
-# CONFIG_PARPORT_PC_SUPERIO is not set
-CONFIG_PARPORT_SERIAL=m
+# CONFIG_PARPORT is not set
+# CONFIG_PARPORT_PC is not set
CONFIG_PARTITION_ADVANCED=y
CONFIG_PATA_ACPI=m
CONFIG_PATA_ALI=m
@@ -3743,9 +3736,7 @@ CONFIG_PPP_SYNC_TTY=m
CONFIG_PPS_CLIENT_GPIO=m
# CONFIG_PPS_CLIENT_KTIMER is not set
CONFIG_PPS_CLIENT_LDISC=m
-CONFIG_PPS_CLIENT_PARPORT=m
# CONFIG_PPS_DEBUG is not set
-CONFIG_PPS_GENERATOR_PARPORT=m
CONFIG_PPS=m
CONFIG_PPTP=m
# CONFIG_PREEMPT is not set
@@ -5425,7 +5416,6 @@ CONFIG_USB_SERIAL_KLSI=m
CONFIG_USB_SERIAL_KOBIL_SCT=m
CONFIG_USB_SERIAL_MCT_U232=m
# CONFIG_USB_SERIAL_METRO is not set
-CONFIG_USB_SERIAL_MOS7715_PARPORT=y
CONFIG_USB_SERIAL_MOS7720=m
CONFIG_USB_SERIAL_MOS7840=m
# CONFIG_USB_SERIAL_MXUPORT is not set
diff --git a/kernel-ppc64p7.config b/kernel-ppc64p7.config
index 02ca43cfc..bd49c9e70 100644
--- a/kernel-ppc64p7.config
+++ b/kernel-ppc64p7.config
@@ -1759,8 +1759,7 @@ CONFIG_I2C_NFORCE2=m
# CONFIG_I2C_NFORCE2_S4985 is not set
# CONFIG_I2C_OCORES is not set
CONFIG_I2C_OPAL=m
-CONFIG_I2C_PARPORT_LIGHT=m
-CONFIG_I2C_PARPORT=m
+# CONFIG_I2C_PARPORT_LIGHT is not set
CONFIG_I2C_PCA_PLATFORM=m
# CONFIG_I2C_PIIX4 is not set
# CONFIG_I2C_RK3X is not set
@@ -3500,14 +3499,8 @@ CONFIG_PANIC_TIMEOUT=0
CONFIG_PANTHERLORD_FF=y
# CONFIG_PARIDE is not set
CONFIG_PARMAN=m
-CONFIG_PARPORT_1284=y
-# CONFIG_PARPORT_AX88796 is not set
-CONFIG_PARPORT=m
-# CONFIG_PARPORT_PC_FIFO is not set
-CONFIG_PARPORT_PC=m
-CONFIG_PARPORT_PC_PCMCIA=m
-# CONFIG_PARPORT_PC_SUPERIO is not set
-CONFIG_PARPORT_SERIAL=m
+# CONFIG_PARPORT is not set
+# CONFIG_PARPORT_PC is not set
CONFIG_PARTITION_ADVANCED=y
CONFIG_PATA_ACPI=m
CONFIG_PATA_ALI=m
@@ -3721,9 +3714,7 @@ CONFIG_PPP_SYNC_TTY=m
CONFIG_PPS_CLIENT_GPIO=m
# CONFIG_PPS_CLIENT_KTIMER is not set
CONFIG_PPS_CLIENT_LDISC=m
-CONFIG_PPS_CLIENT_PARPORT=m
# CONFIG_PPS_DEBUG is not set
-CONFIG_PPS_GENERATOR_PARPORT=m
CONFIG_PPS=m
CONFIG_PPTP=m
# CONFIG_PREEMPT is not set
@@ -5401,7 +5392,6 @@ CONFIG_USB_SERIAL_KLSI=m
CONFIG_USB_SERIAL_KOBIL_SCT=m
CONFIG_USB_SERIAL_MCT_U232=m
# CONFIG_USB_SERIAL_METRO is not set
-CONFIG_USB_SERIAL_MOS7715_PARPORT=y
CONFIG_USB_SERIAL_MOS7720=m
CONFIG_USB_SERIAL_MOS7840=m
# CONFIG_USB_SERIAL_MXUPORT is not set
diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config
index 78b40ced0..0b5805b96 100644
--- a/kernel-s390x-debug.config
+++ b/kernel-s390x-debug.config
@@ -1730,7 +1730,6 @@ CONFIG_I2C_MUX_MLXCPLD=m
# CONFIG_I2C_NFORCE2 is not set
# CONFIG_I2C_NFORCE2_S4985 is not set
# CONFIG_I2C_OCORES is not set
-# CONFIG_I2C_PARPORT is not set
# CONFIG_I2C_PARPORT_LIGHT is not set
# CONFIG_I2C_PCA_PLATFORM is not set
# CONFIG_I2C_PIIX4 is not set
@@ -3451,14 +3450,8 @@ CONFIG_PANIC_TIMEOUT=0
CONFIG_PANTHERLORD_FF=y
# CONFIG_PARIDE is not set
CONFIG_PARMAN=m
-CONFIG_PARPORT_1284=y
-# CONFIG_PARPORT_AX88796 is not set
# CONFIG_PARPORT is not set
-# CONFIG_PARPORT_PC_FIFO is not set
-CONFIG_PARPORT_PC=m
-CONFIG_PARPORT_PC_PCMCIA=m
-# CONFIG_PARPORT_PC_SUPERIO is not set
-CONFIG_PARPORT_SERIAL=m
+# CONFIG_PARPORT_PC is not set
CONFIG_PARTITION_ADVANCED=y
CONFIG_PATA_ACPI=m
CONFIG_PATA_ALI=m
@@ -3635,9 +3628,7 @@ CONFIG_PPP_SYNC_TTY=m
CONFIG_PPS_CLIENT_GPIO=m
# CONFIG_PPS_CLIENT_KTIMER is not set
CONFIG_PPS_CLIENT_LDISC=m
-CONFIG_PPS_CLIENT_PARPORT=m
# CONFIG_PPS_DEBUG is not set
-CONFIG_PPS_GENERATOR_PARPORT=m
CONFIG_PPS=m
CONFIG_PPTP=m
# CONFIG_PREEMPT is not set
@@ -5317,7 +5308,6 @@ CONFIG_USB_SERIAL_KLSI=m
CONFIG_USB_SERIAL_KOBIL_SCT=m
CONFIG_USB_SERIAL_MCT_U232=m
# CONFIG_USB_SERIAL_METRO is not set
-CONFIG_USB_SERIAL_MOS7715_PARPORT=y
CONFIG_USB_SERIAL_MOS7720=m
CONFIG_USB_SERIAL_MOS7840=m
# CONFIG_USB_SERIAL_MXUPORT is not set
diff --git a/kernel-s390x.config b/kernel-s390x.config
index 2b85deb10..350349484 100644
--- a/kernel-s390x.config
+++ b/kernel-s390x.config
@@ -1712,7 +1712,6 @@ CONFIG_I2C_MUX_MLXCPLD=m
# CONFIG_I2C_NFORCE2 is not set
# CONFIG_I2C_NFORCE2_S4985 is not set
# CONFIG_I2C_OCORES is not set
-# CONFIG_I2C_PARPORT is not set
# CONFIG_I2C_PARPORT_LIGHT is not set
# CONFIG_I2C_PCA_PLATFORM is not set
# CONFIG_I2C_PIIX4 is not set
@@ -3429,14 +3428,8 @@ CONFIG_PANIC_TIMEOUT=0
CONFIG_PANTHERLORD_FF=y
# CONFIG_PARIDE is not set
CONFIG_PARMAN=m
-CONFIG_PARPORT_1284=y
-# CONFIG_PARPORT_AX88796 is not set
# CONFIG_PARPORT is not set
-# CONFIG_PARPORT_PC_FIFO is not set
-CONFIG_PARPORT_PC=m
-CONFIG_PARPORT_PC_PCMCIA=m
-# CONFIG_PARPORT_PC_SUPERIO is not set
-CONFIG_PARPORT_SERIAL=m
+# CONFIG_PARPORT_PC is not set
CONFIG_PARTITION_ADVANCED=y
CONFIG_PATA_ACPI=m
CONFIG_PATA_ALI=m
@@ -3613,9 +3606,7 @@ CONFIG_PPP_SYNC_TTY=m
CONFIG_PPS_CLIENT_GPIO=m
# CONFIG_PPS_CLIENT_KTIMER is not set
CONFIG_PPS_CLIENT_LDISC=m
-CONFIG_PPS_CLIENT_PARPORT=m
# CONFIG_PPS_DEBUG is not set
-CONFIG_PPS_GENERATOR_PARPORT=m
CONFIG_PPS=m
CONFIG_PPTP=m
# CONFIG_PREEMPT is not set
@@ -5293,7 +5284,6 @@ CONFIG_USB_SERIAL_KLSI=m
CONFIG_USB_SERIAL_KOBIL_SCT=m
CONFIG_USB_SERIAL_MCT_U232=m
# CONFIG_USB_SERIAL_METRO is not set
-CONFIG_USB_SERIAL_MOS7715_PARPORT=y
CONFIG_USB_SERIAL_MOS7720=m
CONFIG_USB_SERIAL_MOS7840=m
# CONFIG_USB_SERIAL_MXUPORT is not set
diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config
index 52a1fdbe5..e6fbdb4aa 100644
--- a/kernel-x86_64-debug.config
+++ b/kernel-x86_64-debug.config
@@ -4014,7 +4014,6 @@ CONFIG_PPS_CLIENT_GPIO=m
CONFIG_PPS_CLIENT_LDISC=m
CONFIG_PPS_CLIENT_PARPORT=m
# CONFIG_PPS_DEBUG is not set
-CONFIG_PPS_GENERATOR_PARPORT=m
CONFIG_PPS=m
CONFIG_PPTP=m
# CONFIG_PREEMPT is not set
diff --git a/kernel-x86_64.config b/kernel-x86_64.config
index 08afc3a7c..e33386a98 100644
--- a/kernel-x86_64.config
+++ b/kernel-x86_64.config
@@ -3994,7 +3994,6 @@ CONFIG_PPS_CLIENT_GPIO=m
CONFIG_PPS_CLIENT_LDISC=m
CONFIG_PPS_CLIENT_PARPORT=m
# CONFIG_PPS_DEBUG is not set
-CONFIG_PPS_GENERATOR_PARPORT=m
CONFIG_PPS=m
CONFIG_PPTP=m
# CONFIG_PREEMPT is not set
diff --git a/kernel.spec b/kernel.spec
index b5feb3b3d..e9a90676c 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2207,6 +2207,9 @@ fi
#
#
%changelog
+* Sat Sep 9 2017 Peter Robinson <pbrobinson@fedoraproject.org>
+- Only build ParPort support on x86
+
* Mon Sep 4 2017 Peter Robinson <pbrobinson@fedoraproject.org>
- Revert drop of sun8i-emac DT bindings, we support for certain devs