The patch titled
alpha-support-graphics-on-non-zero-pci-domains-fix-2
has been removed from the -mm tree. Its filename was
alpha-support-graphics-on-non-zero-pci-domains-fix-2.patch
This patch was dropped because it was folded into alpha-support-graphics-on-non-zero-pci-domains.patch
------------------------------------------------------
Subject: alpha-support-graphics-on-non-zero-pci-domains-fix-2
From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
In file included from arch/alpha/kernel/process.c:42:
arch/alpha/kernel/proto.h: In function 'locate_and_init_vga':
arch/alpha/kernel/proto.h:117: error: parameter name omitted
Cc: Ivan Kokshaysky <ink@xxxxxxxxxxxxxxxxxxxx>
Cc: Jay Estabrook <jay.estabrook@xxxxxx>
Cc: Richard Henderson <rth@xxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
arch/alpha/kernel/proto.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff -puN arch/alpha/kernel/proto.h~alpha-support-graphics-on-non-zero-pci-domains-fix-2 arch/alpha/kernel/proto.h
--- a/arch/alpha/kernel/proto.h~alpha-support-graphics-on-non-zero-pci-domains-fix-2
+++ a/arch/alpha/kernel/proto.h
@@ -114,7 +114,7 @@ extern void find_console_vga_hose(void);
extern void locate_and_init_vga(void *(*)(void *, void *));
#else
static inline void find_console_vga_hose(void) { }
-static inline void locate_and_init_vga(void *(*)(void *, void *)) { }
+static inline void locate_and_init_vga(void *(*sel_func)(void *, void *)) { }
#endif
/* setup.c */
_
Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are
origin.patch
potential-parse-error-in-ifdef.patch
potential-parse-error-in-ifdef-update.patch
aacraid-fix-shutdown-handler-to-also-disable-interrupts.patch
alpha-support-graphics-on-non-zero-pci-domains.patch
alpha-support-graphics-on-non-zero-pci-domains-fix-2.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
