aboutsummaryrefslogtreecommitdiffstats
path: root/arch/m68k
diff options
context:
space:
mode:
authorGeert Uytterhoeven <geert@linux-m68k.org>2013-06-17 11:50:46 -0400
committerGeert Uytterhoeven <geert@linux-m68k.org>2013-06-24 13:44:30 -0400
commit980f3a7315b4691ec90538352a9e9c5a53ea9d34 (patch)
tree53ab0854d67ba6aad68d66ebf6c1a09b59c19f2f /arch/m68k
parentdb8ac55ca7908a484c11f15c100358d65c108225 (diff)
m68k/q40: Enable PC parallel port in defconfig
Enable the PC parallel port and other related options in the Q40-specific and multi-platform defconfigs. Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Diffstat (limited to 'arch/m68k')
-rw-r--r--arch/m68k/configs/multi_defconfig2
-rw-r--r--arch/m68k/configs/q40_defconfig6
2 files changed, 8 insertions, 0 deletions
diff --git a/arch/m68k/configs/multi_defconfig b/arch/m68k/configs/multi_defconfig
index 0f795d8e65fa..b17a8837f0e1 100644
--- a/arch/m68k/configs/multi_defconfig
+++ b/arch/m68k/configs/multi_defconfig
@@ -214,6 +214,7 @@ CONFIG_DEVTMPFS=y
214# CONFIG_FW_LOADER_USER_HELPER is not set 214# CONFIG_FW_LOADER_USER_HELPER is not set
215CONFIG_CONNECTOR=m 215CONFIG_CONNECTOR=m
216CONFIG_PARPORT=m 216CONFIG_PARPORT=m
217CONFIG_PARPORT_PC=m
217CONFIG_PARPORT_AMIGA=m 218CONFIG_PARPORT_AMIGA=m
218CONFIG_PARPORT_MFC3=m 219CONFIG_PARPORT_MFC3=m
219CONFIG_PARPORT_ATARI=m 220CONFIG_PARPORT_ATARI=m
@@ -325,6 +326,7 @@ CONFIG_ZORRO8390=y
325# CONFIG_NET_VENDOR_SEEQ is not set 326# CONFIG_NET_VENDOR_SEEQ is not set
326# CONFIG_NET_VENDOR_STMICRO is not set 327# CONFIG_NET_VENDOR_STMICRO is not set
327# CONFIG_NET_VENDOR_WIZNET is not set 328# CONFIG_NET_VENDOR_WIZNET is not set
329CONFIG_PLIP=m
328CONFIG_PPP=m 330CONFIG_PPP=m
329CONFIG_PPP_BSDCOMP=m 331CONFIG_PPP_BSDCOMP=m
330CONFIG_PPP_DEFLATE=m 332CONFIG_PPP_DEFLATE=m
diff --git a/arch/m68k/configs/q40_defconfig b/arch/m68k/configs/q40_defconfig
index 8982370e8b42..be1496ed9b66 100644
--- a/arch/m68k/configs/q40_defconfig
+++ b/arch/m68k/configs/q40_defconfig
@@ -199,6 +199,9 @@ CONFIG_DEVTMPFS=y
199# CONFIG_FIRMWARE_IN_KERNEL is not set 199# CONFIG_FIRMWARE_IN_KERNEL is not set
200# CONFIG_FW_LOADER_USER_HELPER is not set 200# CONFIG_FW_LOADER_USER_HELPER is not set
201CONFIG_CONNECTOR=m 201CONFIG_CONNECTOR=m
202CONFIG_PARPORT=m
203CONFIG_PARPORT_PC=m
204CONFIG_PARPORT_1284=y
202CONFIG_BLK_DEV_LOOP=y 205CONFIG_BLK_DEV_LOOP=y
203CONFIG_BLK_DEV_CRYPTOLOOP=m 206CONFIG_BLK_DEV_CRYPTOLOOP=m
204CONFIG_BLK_DEV_DRBD=m 207CONFIG_BLK_DEV_DRBD=m
@@ -267,6 +270,7 @@ CONFIG_NE2000=m
267# CONFIG_NET_VENDOR_SMSC is not set 270# CONFIG_NET_VENDOR_SMSC is not set
268# CONFIG_NET_VENDOR_STMICRO is not set 271# CONFIG_NET_VENDOR_STMICRO is not set
269# CONFIG_NET_VENDOR_WIZNET is not set 272# CONFIG_NET_VENDOR_WIZNET is not set
273CONFIG_PLIP=m
270CONFIG_PPP=m 274CONFIG_PPP=m
271CONFIG_PPP_BSDCOMP=m 275CONFIG_PPP_BSDCOMP=m
272CONFIG_PPP_DEFLATE=m 276CONFIG_PPP_DEFLATE=m
@@ -292,9 +296,11 @@ CONFIG_SERIO_Q40KBD=y
292CONFIG_VT_HW_CONSOLE_BINDING=y 296CONFIG_VT_HW_CONSOLE_BINDING=y
293# CONFIG_LEGACY_PTYS is not set 297# CONFIG_LEGACY_PTYS is not set
294# CONFIG_DEVKMEM is not set 298# CONFIG_DEVKMEM is not set
299CONFIG_PRINTER=m
295# CONFIG_HW_RANDOM is not set 300# CONFIG_HW_RANDOM is not set
296CONFIG_NTP_PPS=y 301CONFIG_NTP_PPS=y
297CONFIG_PPS_CLIENT_LDISC=m 302CONFIG_PPS_CLIENT_LDISC=m
303CONFIG_PPS_CLIENT_PARPORT=m
298CONFIG_PTP_1588_CLOCK=m 304CONFIG_PTP_1588_CLOCK=m
299# CONFIG_HWMON is not set 305# CONFIG_HWMON is not set
300CONFIG_FB=y 306CONFIG_FB=y