diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-01-12 18:11:10 -0500 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-01-12 18:11:10 -0500 |
| commit | 1af131a512b6cf244a8b50565e0553f9b11b4328 (patch) | |
| tree | bcb9ce4754c164fd79091e3cb6861d4df82dc1e1 /libre/linux-libre/config.i686 | |
| parent | 330c0a9ff2e05b86f69f0209b3265cb003e0c98d (diff) | |
| parent | 994ea903447400adf05d1da1d36d7df8f7dbcd56 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/srv/git/abslibre
Conflicts:
libre/iceweasel-i18n/PKGBUILD
libre/iceweasel-libre/PKGBUILD
libre/iceweasel-libre/libre.patch
libre/iceweasel-libre/mozconfig
Diffstat (limited to 'libre/linux-libre/config.i686')
| -rw-r--r-- | libre/linux-libre/config.i686 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libre/linux-libre/config.i686 b/libre/linux-libre/config.i686 index 5413daf03..5c6f3f62a 100644 --- a/libre/linux-libre/config.i686 +++ b/libre/linux-libre/config.i686 @@ -733,7 +733,7 @@ CONFIG_IP_MROUTE=y # CONFIG_IP_MROUTE_MULTIPLE_TABLES is not set CONFIG_IP_PIMSM_V1=y CONFIG_IP_PIMSM_V2=y -# CONFIG_ARPD is not set +CONFIG_ARPD=y CONFIG_SYN_COOKIES=y CONFIG_NET_IPVTI=m CONFIG_INET_AH=m @@ -5735,7 +5735,7 @@ CONFIG_RING_BUFFER_BENCHMARK=m # CONFIG_INTERVAL_TREE_TEST is not set # CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set # CONFIG_FIREWIRE_OHCI_REMOTE_DMA is not set -# CONFIG_DYNAMIC_DEBUG is not set +CONFIG_DYNAMIC_DEBUG=y # CONFIG_DMA_API_DEBUG is not set # CONFIG_ATOMIC64_SELFTEST is not set CONFIG_ASYNC_RAID6_TEST=m |