diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2009-06-04 19:51:01 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2009-06-04 19:51:01 +0200 |
| commit | cf7d637ee9c6034152f9f789c8e65893f0295289 (patch) | |
| tree | b6bc077658a89d8a65446f592186c9ca98b13a3e /target | |
| parent | 322327d668e6cef8bb5f318bc414593794530b7b (diff) | |
first regressions found while runtime testing
- fix add_rconf and quoting
- update gpsd to latest upstream
- do not use size parameter for cfgfs and tmpfs
- disable some dangerous busybox options
- fix some kernel module dependencies
Diffstat (limited to 'target')
| -rw-r--r-- | target/alix1c/kernel.config | 4 | ||||
| -rw-r--r-- | target/linux/config/Config.in.network | 7 |
2 files changed, 9 insertions, 2 deletions
diff --git a/target/alix1c/kernel.config b/target/alix1c/kernel.config index 33167be9d..e3813938f 100644 --- a/target/alix1c/kernel.config +++ b/target/alix1c/kernel.config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.29.1 -# Sun May 31 01:11:31 2009 +# Tue Jun 2 20:52:07 2009 # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -464,7 +464,7 @@ CONFIG_ATA=y # CONFIG_SATA_SIL24 is not set CONFIG_ATA_SFF=y # CONFIG_SATA_SVW is not set -# CONFIG_ATA_PIIX is not set +CONFIG_ATA_PIIX=y # CONFIG_SATA_MV is not set # CONFIG_SATA_NV is not set # CONFIG_PDC_ADMA is not set diff --git a/target/linux/config/Config.in.network b/target/linux/config/Config.in.network index 724233ab3..9b999bf0f 100644 --- a/target/linux/config/Config.in.network +++ b/target/linux/config/Config.in.network @@ -84,9 +84,15 @@ config ADK_KPACKAGE_KMOD_BRIDGE Enabling arptables support when bridging will let arptables see bridged ARP traffic in the arptables FORWARD chain. +config ADK_KPACKAGE_KMOD_INET_TUNNEL + tristate + default n + help + config ADK_KPACKAGE_KMOD_NET_IPIP prompt "kmod-net-ipip..................... IP in IP encapsulation support" tristate + select ADK_KPACKAGE_KMOD_INET_TUNNEL default n help Tunneling means encapsulating data of one protocol type within @@ -134,6 +140,7 @@ config ADK_KPACKAGE_KMOD_IPV6_SIT prompt "kmod-ipv6-sit..................... IPv6-in-IPv4 tunnel (SIT driver)" tristate depends ADK_IPV6 + select ADK_KPACKAGE_KMOD_INET_TUNNEL default n help Tunneling means encapsulating data of one protocol type within |