The patch titled x86: geode: define geode_has_vsa2() even if CONFIG_MGEODE_LX is not set has been removed from the -mm tree. Its filename was x86-geode-define-geode_has_vsa2-even-if-config_mgeode_lx-is-not-set.patch This patch was dropped because it was merged into mainline or a subsystem tree The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: x86: geode: define geode_has_vsa2() even if CONFIG_MGEODE_LX is not set From: Andres Salomon <dilinger@xxxxxxxxxx> We want drivers to be able to use geode_has_vsa2 without having to worry about what model geode is being compiled for. This patch ensures that geode_has_vsa2 is always defined. Signed-off-by: Andres Salomon <dilinger@xxxxxxxxxx> Cc: Ingo Molnar <mingo@xxxxxxx> Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx> Cc: Jordan Crouse <jordan.crouse@xxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- include/asm-x86/geode.h | 7 +++++++ 1 file changed, 7 insertions(+) diff -puN include/asm-x86/geode.h~x86-geode-define-geode_has_vsa2-even-if-config_mgeode_lx-is-not-set include/asm-x86/geode.h --- a/include/asm-x86/geode.h~x86-geode-define-geode_has_vsa2-even-if-config_mgeode_lx-is-not-set +++ a/include/asm-x86/geode.h @@ -185,7 +185,14 @@ static inline int is_geode(void) return (is_geode_gx() || is_geode_lx()); } +#ifdef CONFIG_MGEODE_LX extern int geode_has_vsa2(void); +#else +static inline int geode_has_vsa2(void) +{ + return 0; +} +#endif /* MFGPTs */ _ Patches currently in -mm which might be from dilinger@xxxxxxxxxx are revert-lxfb-extend-pll-table-to-support-dotclocks-below-25-mhz.patch git-x86.patch git-input.patch git-battery.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