diff options
| author | Chris Larson <clarson@kergoth.com> | 2004-09-13 22:40:21 +0000 |
|---|---|---|
| committer | Chris Larson <clarson@kergoth.com> | 2004-09-13 22:40:21 +0000 |
| commit | c65af0edd12140dbc9f3422c2054ba6f7e0bdea9 (patch) | |
| tree | c195dc1d36c2e620720aa5ff3483af76a265e2f8 /linux | |
| parent | cbea85ebff006c7de640b412a8ef01c5f5d47094 (diff) | |
Merge openembedded@openembedded.bkbits.net:packages
into handhelds.org:/home/kergoth/code/oe/packages
2004/09/14 00:14:43+02:00 uni-frankfurt.de!mickeyl
Merge bk://openembedded@openembedded.bkbits.net/packages
into gandalf.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages
2004/09/14 00:14:24+02:00 uni-frankfurt.de!mickeyl
upgrade patcher to 20040913. patcher has a nifty new feature (based on my featurewish, thanks Holger). If you supply -R, it automatically refreshes a patch when line numbers changed (previously it only notified the user about that). The developer can then copy the patches back to the repository once in a while to ease upgrading or prevent unnecessary manual merges when upstream changes gradually.
2004/09/13 21:37:43+02:00 uni-frankfurt.de!mickeyl
enable a couple of extra modules in defconfig-tosa
BKrev: 414621d567thj7D0rCJV-paRni1fOQ
Diffstat (limited to 'linux')
| -rw-r--r-- | linux/openzaurus-pxa-2.4.18-rmk7-pxa3-embedix20031107/defconfig-tosa | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/linux/openzaurus-pxa-2.4.18-rmk7-pxa3-embedix20031107/defconfig-tosa b/linux/openzaurus-pxa-2.4.18-rmk7-pxa3-embedix20031107/defconfig-tosa index 5dade995fb..df1bf11c7d 100644 --- a/linux/openzaurus-pxa-2.4.18-rmk7-pxa3-embedix20031107/defconfig-tosa +++ b/linux/openzaurus-pxa-2.4.18-rmk7-pxa3-embedix20031107/defconfig-tosa @@ -370,14 +370,14 @@ CONFIG_PACKET_MMAP=y CONFIG_NETLINK_DEV=y CONFIG_NETFILTER=y # CONFIG_NETFILTER_DEBUG is not set -# CONFIG_FILTER is not set +CONFIG_FILTER=y CONFIG_UNIX=y CONFIG_INET=y # CONFIG_IP_MULTICAST is not set # CONFIG_IP_ADVANCED_ROUTER is not set # CONFIG_IP_PNP is not set -# CONFIG_NET_IPIP is not set -# CONFIG_NET_IPGRE is not set +CONFIG_NET_IPIP=m +CONFIG_NET_IPGRE=m # CONFIG_ARPD is not set # CONFIG_INET_ECN is not set # CONFIG_SYN_COOKIES is not set @@ -468,7 +468,7 @@ CONFIG_PPP_ASYNC=y # CONFIG_PPP_SYNC_TTY is not set # CONFIG_PPP_DEFLATE is not set CONFIG_PPP_BSDCOMP=y -# CONFIG_PPP_MPPE is not set +CONFIG_PPP_MPPE=m # CONFIG_PPPOE is not set # CONFIG_SLIP is not set @@ -534,7 +534,7 @@ CONFIG_IRDA=y # IrDA protocols # # CONFIG_IRLAN is not set -# CONFIG_IRNET is not set +CONFIG_IRNET=m CONFIG_IRCOMM=y # CONFIG_IRDA_ULTRA is not set |