linux-next: manual merge of the akpm-current tree with the v4l-dvb tree

[Stephen Rothwell]

Hi Andrew,

Today's linux-next merge of the akpm-current tree got a conflict in
include/linux/kconfig.h between commit 9b174527e7b7 ("[media] Add and
use IS_REACHABLE macro") from the v4l-dvb tree and commit 85ca6a006505
("kconfig-use-macros-which-are-already-defined-fix") from the
akpm-current tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc include/linux/kconfig.h
index 16cfb3448568,63ca8dacec59..000000000000
--- a/include/linux/kconfig.h
+++ b/include/linux/kconfig.h
@@@ -44,12 -36,10 +36,19 @@@
  #define IS_MODULE(option) config_enabled(option##_MODULE)
  
  /*
+  * IS_ENABLED(CONFIG_FOO) evaluates to 1 if CONFIG_FOO is set to 'y' or 'm',
+  * 0 otherwise.
+  */
+ #define IS_ENABLED(option) \
+ 	(IS_BUILTIN(option) || IS_MODULE(option))
+ 
++/*
 + * IS_REACHABLE(CONFIG_FOO) evaluates to 1 if the currently compiled
 + * code can call a function defined in code compiled based on CONFIG_FOO.
 + * This is similar to IS_ENABLED(), but returns false when invoked from
 + * built-in code when CONFIG_FOO is set to 'm'.
 + */
 +#define IS_REACHABLE(option) (config_enabled(option) || \
 +		 (config_enabled(option##_MODULE) && config_enabled(MODULE)))
 +
  #endif /* __LINUX_KCONFIG_H */

Attachment: pgpm4wiH8vxnA.pgp
Description: OpenPGP digital signature