The following commit has been merged in the master branch: commit 6631c5cea8687cf4d36327fdbceb0691cd5d2e29 Author: David S. Miller davem@davemloft.net Date: Wed Jan 15 16:54:14 2014 -0800
Revert "batman-adv: drop dependency against CRC16"
This reverts commit 12afc36e38b3b6a0ec9bda71632c2285e7fdbab2.
The dependency is actually still necessary.
Signed-off-by: David S. Miller davem@davemloft.net
diff --git a/net/batman-adv/Kconfig b/net/batman-adv/Kconfig index 2b2dc47..fa780b7 100644 --- a/net/batman-adv/Kconfig +++ b/net/batman-adv/Kconfig @@ -5,6 +5,7 @@ config BATMAN_ADV tristate "B.A.T.M.A.N. Advanced Meshing Protocol" depends on NET + select CRC16 select LIBCRC32C default n help
linux-merge@lists.open-mesh.org