From: Erik Hovland Date: Fri, 5 May 2006 21:28:39 +0000 (+0000) Subject: Merge of fix in oz354fam083 branch for familair bug 1606. X-Git-Tag: Release-2010-05/1~9453^2~1624^2~1^2~2^2~1^2~2 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=07423bdbbb7ce2d14455d6b886d4b0156cd28a18;p=openembedded.git Merge ... fix in oz354fam083 branch for familair bug 1606. --- diff --git a/packages/linux/handhelds-sa-2.4.19-rmk6-pxa1-hh37.4/defconfig-h3600 b/packages/linux/handhelds-sa-2.4.19-rmk6-pxa1-hh37.4/defconfig-h3600 index 97aeac5392..0c3aca3e10 100644 --- a/packages/linux/handhelds-sa-2.4.19-rmk6-pxa1-hh37.4/defconfig-h3600 +++ b/packages/linux/handhelds-sa-2.4.19-rmk6-pxa1-hh37.4/defconfig-h3600 @@ -235,7 +235,11 @@ CONFIG_ALIGNMENT_TRAP=y # # Parallel port support # -# CONFIG_PARPORT is not set +CONFIG_PARPORT=m +CONFIG_PARPORT_PC=m +CONFIG_PARPORT_SERIAL=m +CONFIG_PARPORT_PC_PCMCIA=m +CONFIG_PARPORT_NOT_PC=y # # Memory Technology Devices (MTD) diff --git a/packages/linux/handhelds-sa-2.4.19-rmk6-pxa1-hh40/defconfig-h3600 b/packages/linux/handhelds-sa-2.4.19-rmk6-pxa1-hh40/defconfig-h3600 index ad30591336..dfff54a0d1 100644 --- a/packages/linux/handhelds-sa-2.4.19-rmk6-pxa1-hh40/defconfig-h3600 +++ b/packages/linux/handhelds-sa-2.4.19-rmk6-pxa1-hh40/defconfig-h3600 @@ -235,7 +235,11 @@ CONFIG_ALIGNMENT_TRAP=y # # Parallel port support # -# CONFIG_PARPORT is not set +CONFIG_PARPORT=m +CONFIG_PARPORT_PC=m +CONFIG_PARPORT_SERIAL=m +CONFIG_PARPORT_PC_PCMCIA=m +CONFIG_PARPORT_NOT_PC=y # # Memory Technology Devices (MTD)