3 files changed, 18 insertions, 19 deletions
diff --git a/target/linux/generic-2.6/config-2.6.22 b/target/linux/generic-2.6/config-2.6.22
index ca547bb0d8..4d6a3b7fcf 100644
--- a/target/linux/generic-2.6/config-2.6.22
+++ b/target/linux/generic-2.6/config-2.6.22
@@ -53,6 +53,8 @@ CONFIG_AX25=m
 # CONFIG_BACKLIGHT_LCD_SUPPORT is not set
 CONFIG_BASE_FULL=y
 # CONFIG_BASLER_EXCITE is not set
+# CONFIG_BAYCOM_EPP is not set
+# CONFIG_BAYCOM_PAR is not set
 # CONFIG_BAYCOM_SER_FDX is not set
 # CONFIG_BAYCOM_SER_HDX is not set
 CONFIG_BCM43XX=m
@@ -423,7 +425,7 @@ CONFIG_INET6_XFRM_MODE_TRANSPORT=m
 CONFIG_INET6_XFRM_MODE_TUNNEL=m
 CONFIG_INET6_XFRM_TUNNEL=m
 CONFIG_INET_AH=m
-CONFIG_INET_DCCP_DIAG=m
+# CONFIG_INET_DCCP_DIAG is not et
 CONFIG_INET_DIAG=m
 CONFIG_INET_ESP=m
 CONFIG_INET_IPCOMP=m
@@ -499,14 +501,7 @@ CONFIG_IPW2200_MONITOR=y
 # CONFIG_IPW2200_RADIOTAP is not set
 # CONFIG_IPX is not set
 CONFIG_IP_ADVANCED_ROUTER=y
-CONFIG_IP_DCCP=m
-CONFIG_IP_DCCP_ACKVEC=y
-CONFIG_IP_DCCP_CCID2=m
-# CONFIG_IP_DCCP_CCID2_DEBUG is not set
-CONFIG_IP_DCCP_CCID3=m
-# CONFIG_IP_DCCP_CCID3_DEBUG is not set
-CONFIG_IP_DCCP_CCID3_RTO=100
-CONFIG_IP_DCCP_TFRC_LIB=m
+# CONFIG_IP_DCCP is not set
 CONFIG_IP_FIB_HASH=y
 # CONFIG_IP_FIB_TRIE is not set
 # CONFIG_IP_MROUTE is not set
@@ -622,7 +617,7 @@ CONFIG_JFFS2_RTIME=y
 CONFIG_JFFS2_ZLIB=y
 # CONFIG_JFFS_FS is not set
 # CONFIG_JFS_DEBUG is not set
-CONFIG_JFS_FS=m
+# CONFIG_JFS_FS is not set
 # CONFIG_JFS_POSIX_ACL is not set
 # CONFIG_JFS_SECURITY is not set
 # CONFIG_JFS_STATISTICS is not set
@@ -881,13 +876,14 @@ CONFIG_NO_HZ=y
 CONFIG_NORTEL_HERMES=m
 # CONFIG_NS83820 is not set
 # CONFIG_NTFS_DEBUG is not set
-CONFIG_NTFS_FS=m
-CONFIG_NTFS_RW=y
+# CONFIG_NTFS_FS is not set
+# CONFIG_NTFS_RW is not set
 # CONFIG_OCFS2_FS is not set
 # CONFIG_OSF_PARTITION is not set
 CONFIG_PACKET=y
 CONFIG_PACKET_MMAP=y
 # CONFIG_PARPORT is not set
+# CONFIG_PARPORT_PC is not set
 CONFIG_PARTITION_ADVANCED=y
 # CONFIG_PATA_ALI is not set
 # CONFIG_PATA_AMD is not set
@@ -1006,7 +1002,7 @@ CONFIG_PROC_SYSCTL=y
 CONFIG_RAMFS=y
 # CONFIG_RAW_DRIVER is not set
 # CONFIG_REISERFS_CHECK is not set
-CONFIG_REISERFS_FS=m
+# CONFIG_REISERFS_FS is not set
 # CONFIG_REISERFS_FS_XATTR is not set
 # CONFIG_REISERFS_PROC_INFO is not set
 # CONFIG_RELAY is not set
@@ -1179,7 +1175,7 @@ CONFIG_SLAB=y
 CONFIG_SLHC=m
 # CONFIG_SLIP is not set
 # CONFIG_SLOB is not set
-CONFIG_SMB_FS=m
+# CONFIG_SMB_FS is not set
 # CONFIG_SMB_NLS_DEFAULT is not set
 CONFIG_SND=m
 # CONFIG_SND_AD1816A is not set
diff --git a/target/linux/generic-2.6/config-template b/target/linux/generic-2.6/config-template
index 12706d4ff6..1600157e35 100644
--- a/target/linux/generic-2.6/config-template
+++ b/target/linux/generic-2.6/config-template
@@ -51,6 +51,8 @@ CONFIG_AX25=m
 # CONFIG_BACKLIGHT_LCD_SUPPORT is not set
 CONFIG_BASE_FULL=y
 # CONFIG_BASLER_EXCITE is not set
+# CONFIG_BAYCOM_EPP is not set
+# CONFIG_BAYCOM_PAR is not set
 # CONFIG_BAYCOM_SER_FDX is not set
 # CONFIG_BAYCOM_SER_HDX is not set
 CONFIG_BCM43XX=m
@@ -605,7 +607,7 @@ CONFIG_JFFS2_RTIME=y
 CONFIG_JFFS2_ZLIB=y
 # CONFIG_JFFS_FS is not set
 # CONFIG_JFS_DEBUG is not set
-CONFIG_JFS_FS=m
+# CONFIG_JFS_FS is not set
 # CONFIG_JFS_POSIX_ACL is not set
 # CONFIG_JFS_SECURITY is not set
 # CONFIG_JFS_STATISTICS is not set
@@ -856,8 +858,8 @@ CONFIG_NLS_UTF8=m
 CONFIG_NORTEL_HERMES=m
 # CONFIG_NS83820 is not set
 # CONFIG_NTFS_DEBUG is not set
-CONFIG_NTFS_FS=m
-CONFIG_NTFS_RW=y
+# CONFIG_NTFS_FS is not set
+# CONFIG_NTFS_RW is not set
 # CONFIG_OCFS2_FS is not set
 # CONFIG_OSF_PARTITION is not set
 CONFIG_PACKET=y
@@ -978,7 +980,7 @@ CONFIG_PROC_SYSCTL=y
 CONFIG_RAMFS=y
 # CONFIG_RAW_DRIVER is not set
 # CONFIG_REISERFS_CHECK is not set
-CONFIG_REISERFS_FS=m
+# CONFIG_REISERFS_FS is not set
 # CONFIG_REISERFS_FS_XATTR is not set
 # CONFIG_REISERFS_PROC_INFO is not set
 # CONFIG_RELAY is not set
@@ -1144,7 +1146,7 @@ CONFIG_SLAB=y
 CONFIG_SLHC=m
 # CONFIG_SLIP is not set
 # CONFIG_SLOB is not set
-CONFIG_SMB_FS=m
+# CONFIG_SMB_FS is not set
 # CONFIG_SMB_NLS_DEFAULT is not set
 CONFIG_SND=m
 # CONFIG_SND_AD1816A is not set
diff --git a/target/linux/x86-2.6/config/default b/target/linux/x86-2.6/config/default
index a4730b330a..0fc4bf4f9c 100644
--- a/target/linux/x86-2.6/config/default
+++ b/target/linux/x86-2.6/config/default
@@ -270,6 +270,7 @@ CONFIG_NSC_GPIO=m
 CONFIG_NVRAM=y
 CONFIG_PAGE_OFFSET=0xC0000000
 # CONFIG_PARAVIRT is not set
+CONFIG_PARPORT_PC=m
 CONFIG_PC8736x_GPIO=m
 # CONFIG_PC87413_WDT is not set
 CONFIG_PCCARD=m