Only build ParPort support on x86, ARM and s390x long disabled it, only PPC HW that shipped it was long prior to anything we remotely support

42 files changed, 39 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 48c843dcd..5d35fe0b5 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -2052,8 +2052,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
@@ -3910,14 +3909,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
@@ -4173,9 +4166,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
@@ -6130,7 +6121,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 3d1239107..c53d5553a 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.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
@@ -3889,14 +3888,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
@@ -4152,9 +4145,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
@@ -6107,7 +6098,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 46c69b917..ab2595d6f 100644
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@@ -2188,8 +2188,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
@@ -4195,14 +4194,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
@@ -4482,9 +4475,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
@@ -6652,7 +6643,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 92af2373e..997dc1831 100644
--- a/kernel-armv7hl-lpae-debug.config
+++ b/kernel-armv7hl-lpae-debug.config
@@ -2078,8 +2078,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
@@ -3982,14 +3981,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
@@ -4242,9 +4235,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
@@ -6222,7 +6213,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 51da38e23..68cb11f05 100644
--- a/kernel-armv7hl-lpae.config
+++ b/kernel-armv7hl-lpae.config
@@ -2061,8 +2061,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
@@ -3961,14 +3960,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
@@ -4221,9 +4214,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
@@ -6199,7 +6190,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 2a2509f2d..24abb66c4 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -2171,8 +2171,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
@@ -4174,14 +4173,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
@@ -4461,9 +4454,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
@@ -6629,7 +6620,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 bef1accdc..e663c66b9 100644
--- a/kernel-i686-PAE.config
+++ b/kernel-i686-PAE.config
@@ -3992,7 +3992,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 8629ad00c..6c9e7ad82 100644
--- a/kernel-i686-PAEdebug.config
+++ b/kernel-i686-PAEdebug.config
@@ -4012,7 +4012,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 630d793d9..d7e684751 100644
--- a/kernel-i686-debug.config
+++ b/kernel-i686-debug.config
@@ -4012,7 +4012,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 b06f63aa5..6f20af809 100644
--- a/kernel-i686.config
+++ b/kernel-i686.config
@@ -3992,7 +3992,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 ecbf28306..12fa1da84 100644
--- a/kernel-ppc64-debug.config
+++ b/kernel-ppc64-debug.config
@@ -1837,8 +1837,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
@@ -3603,14 +3602,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
@@ -3836,9 +3829,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
@@ -5540,7 +5531,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 669941a0c..c35f0c8bf 100644
--- a/kernel-ppc64.config
+++ b/kernel-ppc64.config
@@ -1819,8 +1819,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
@@ -3581,14 +3580,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
@@ -3814,9 +3807,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
@@ -5516,7 +5507,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 6184e8270..d8a87d4db 100644
--- a/kernel-ppc64le-debug.config
+++ b/kernel-ppc64le-debug.config
@@ -1790,8 +1790,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
@@ -3548,14 +3547,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
@@ -3776,9 +3769,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
@@ -5469,7 +5460,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 5c0729842..99322ee78 100644
--- a/kernel-ppc64le.config
+++ b/kernel-ppc64le.config
@@ -1772,8 +1772,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
@@ -3526,14 +3525,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
@@ -3754,9 +3747,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
@@ -5445,7 +5436,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 e9d711c97..765f0f44e 100644
--- a/kernel-ppc64p7-debug.config
+++ b/kernel-ppc64p7-debug.config
@@ -1789,8 +1789,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
@@ -3547,14 +3546,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
@@ -3775,9 +3768,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
@@ -5468,7 +5459,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 9da318d0f..6726e7c9c 100644
--- a/kernel-ppc64p7.config
+++ b/kernel-ppc64p7.config
@@ -1771,8 +1771,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
@@ -3525,14 +3524,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
@@ -3753,9 +3746,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
@@ -5444,7 +5435,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 a1e4b8df7..28c3da678 100644
--- a/kernel-s390x-debug.config
+++ b/kernel-s390x-debug.config
@@ -1745,7 +1745,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
@@ -3479,14 +3478,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
@@ -3668,9 +3661,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
@@ -5361,7 +5352,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 9d90d6d28..00e767b6d 100644
--- a/kernel-s390x.config
+++ b/kernel-s390x.config
@@ -1727,7 +1727,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
@@ -3457,14 +3456,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
@@ -3646,9 +3639,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
@@ -5337,7 +5328,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 356e64b66..c0260abe3 100644
--- a/kernel-x86_64-debug.config
+++ b/kernel-x86_64-debug.config
@@ -4050,7 +4050,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 45e03c77f..9dd07675c 100644
--- a/kernel-x86_64.config
+++ b/kernel-x86_64.config
@@ -4030,7 +4030,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 dbeedcdc1..40f5398d5 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2204,6 +2204,9 @@ fi
 #
 #
 %changelog
+* Sat Sep  9 2017 Peter Robinson <pbrobinson@fedoraproject.org>
+- Only build ParPort support on x86
+
 * Fri Sep 08 2017 Justin M. Forbes <jforbes@fedoraproject.org> - 4.14.0-0.rc0.git3.1
 - Linux v4.13-9219-g015a9e66b9b8