The patch titled
vt: proper prototypes for some console functions
has been removed from the -mm tree. Its filename is
vt-proper-prototypes-for-some-console-functions.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: vt: proper prototypes for some console functions
From: Adrian Bunk <bunk@xxxxxxxxx>
This patch adds proper prototypes to header files for three console init
functions used on drivers/char/vt.c
Signed-off-by: Adrian Bunk <bunk@xxxxxxxxx>
Signed-off-by: Antonino Daplas <adaplas@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/char/vt.c | 8 --------
include/linux/console.h | 3 +++
include/linux/consolemap.h | 1 +
3 files changed, 4 insertions(+), 8 deletions(-)
diff -puN drivers/char/vt.c~vt-proper-prototypes-for-some-console-functions drivers/char/vt.c
--- a/drivers/char/vt.c~vt-proper-prototypes-for-some-console-functions
+++ a/drivers/char/vt.c
@@ -139,14 +139,6 @@ const struct consw *conswitchp;
extern void vcs_make_sysfs(struct tty_struct *tty);
extern void vcs_remove_sysfs(struct tty_struct *tty);
-extern void console_map_init(void);
-#ifdef CONFIG_PROM_CONSOLE
-extern void prom_con_init(void);
-#endif
-#ifdef CONFIG_MDA_CONSOLE
-extern int mda_console_init(void);
-#endif
-
struct vc vc_cons [MAX_NR_CONSOLES];
#ifndef VT_SINGLE_DRIVER
diff -puN include/linux/console.h~vt-proper-prototypes-for-some-console-functions include/linux/console.h
--- a/include/linux/console.h~vt-proper-prototypes-for-some-console-functions
+++ a/include/linux/console.h
@@ -129,6 +129,9 @@ static inline void suspend_console(void)
static inline void resume_console(void) {}
#endif /* CONFIG_DISABLE_CONSOLE_SUSPEND */
+int mda_console_init(void);
+void prom_con_init(void);
+
/* Some debug stub to catch some of the obvious races in the VT code */
#if 1
#define WARN_CONSOLE_UNLOCKED() WARN_ON(!is_console_locked() && !oops_in_progress)
diff -puN include/linux/consolemap.h~vt-proper-prototypes-for-some-console-functions include/linux/consolemap.h
--- a/include/linux/consolemap.h~vt-proper-prototypes-for-some-console-functions
+++ a/include/linux/consolemap.h
@@ -13,3 +13,4 @@ struct vc_data;
extern unsigned char inverse_translate(struct vc_data *conp, int glyph);
extern unsigned short *set_translate(int m, struct vc_data *vc);
extern int conv_uni_to_pc(struct vc_data *conp, long ucs);
+void console_map_init(void);
_
Patches currently in -mm which might be from bunk@xxxxxxxxx are
origin.patch
git-pcmcia.patch
drivers-net-pcmcia-xirc2ps_csc-remove-unused-label.patch
drivers-scsi-aic7xxx-possible-cleanups.patch
drivers-scsi-small-cleanups.patch
drivers-scsi-qla2xxx-make-some-functions-static.patch
drivers-scsi-aic7xxx-aic79xx_corec-make-ahd_match_scb-static.patch
drivers-scsi-advansysc-cleanups.patch
make-drivers-scsi-aic7xxx-aic79xx_coreahd_set_tags-static.patch
megaraid-fix-warnings-when-config_proc_fs=n.patch
acx1xx-wireless-driver.patch
drivers-edac-make-code-static.patch
fs-reiser4-possible-cleanups.patch
reiser4-possible-cleanups-2.patch
slab-cache-shrinker-statistics.patch
debug-shared-irqs-kconfig-fix.patch
i386-enable-4k-stacks-by-default.patch
mutex-subsystem-synchro-test-module.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
