The patch titled isdn: rename CONFIG_AVMB1_COMPAT to not look like a Kconfig variable has been added to the -mm tree. Its filename is isdn-rename-config_avmb1_compat-to-not-look-like-a-kconfig-variable.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: isdn: rename CONFIG_AVMB1_COMPAT to not look like a Kconfig variable From: "Robert P. J. Day" <rpjday@xxxxxxxxxxxxxx> Since CONFIG_AVMB1_COMPAT is not a Kconfig variable, move it out of the Kconfig namespace. Signed-off-by: Robert P. J. Day <rpjday@xxxxxxxxxxxxxx> Acked-by: Karsten Keil <kkeil@xxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/isdn/capi/kcapi.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff -puN drivers/isdn/capi/kcapi.c~isdn-rename-config_avmb1_compat-to-not-look-like-a-kconfig-variable drivers/isdn/capi/kcapi.c --- a/drivers/isdn/capi/kcapi.c~isdn-rename-config_avmb1_compat-to-not-look-like-a-kconfig-variable +++ a/drivers/isdn/capi/kcapi.c @@ -10,7 +10,7 @@ * */ -#define CONFIG_AVMB1_COMPAT +#define AVMB1_COMPAT #include "kcapi.h" #include <linux/module.h> @@ -29,7 +29,7 @@ #include <asm/uaccess.h> #include <linux/isdn/capicmd.h> #include <linux/isdn/capiutil.h> -#ifdef CONFIG_AVMB1_COMPAT +#ifdef AVMB1_COMPAT #include <linux/b1lli.h> #endif #include <linux/mutex.h> @@ -740,7 +740,7 @@ u16 capi20_get_profile(u32 contr, struct EXPORT_SYMBOL(capi20_get_profile); -#ifdef CONFIG_AVMB1_COMPAT +#ifdef AVMB1_COMPAT static int old_capi_manufacturer(unsigned int cmd, void __user *data) { avmb1_loadandconfigdef ldef; @@ -904,7 +904,7 @@ int capi20_manufacturer(unsigned int cmd struct capi_ctr *card; switch (cmd) { -#ifdef CONFIG_AVMB1_COMPAT +#ifdef AVMB1_COMPAT case AVMB1_LOAD: case AVMB1_LOAD_AND_CONFIG: case AVMB1_RESETCARD: _ Patches currently in -mm which might be from rpjday@xxxxxxxxxxxxxx are origin.patch git-mtd.patch git-nfsd.patch xtensa-warn-about-including-asm-rwsemh-directly.patch xtensa-use-newer-__spin_lock_unlocked-macro.patch kernel-explicitly-include-required-header-files-under-kernel.patch remove-superfluous-include-of-stringh-from-percpuh.patch kbuild-remove-duplicate-conflicting-entry-for-oomh.patch kbuild-move-files-that-dont-check-__kernel__.patch lists-add-const-qualifier-to-first-arg-of-list_splice-operations.patch lists-add-const-qualifier-to-first-arg-of-list_splice-operations-checkpatch-fixes.patch maintainers-clarify-status-of-mn10300-mailing-list-as-moderated.patch mfd-use-shorter-set_current_state.patch isdn-fix-obvious-cut-and-paste-error-in-st5481_usbc.patch isdn-rename-config_avmb1_compat-to-not-look-like-a-kconfig-variable.patch ipmi-make-comment-match-actual-preprocessor-check.patch keys-explicitly-include-required-slabh-header-file.patch nbd-delete-superfluous-test-for-__gnuc__.patch generalize-asm-generic-ioctlh-to-allow-overriding-values.patch edac-use-the-shorter-list_head-for-brevity.patch afs-use-the-shorter-list_head-for-brevity.patch sysv-fs-remove-superfluous-check-for-__gnuc__-compiler.patch remove-ifdef-__kernel__-checks-from-unexported-headers.patch remove-__kernel__-tests-of-unexported-headers-under-asm-generic.patch drop-the-exporting-of-empty-linux-byteorder-generich.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html