The patch titled
vt-binding-add-sysfs-control-to-the-vt-layer-fix
has been removed from the -mm tree. Its filename is
vt-binding-add-sysfs-control-to-the-vt-layer-fix.patch
This patch was dropped because it was folded into vt-binding-add-sysfs-control-to-the-vt-layer.patch
------------------------------------------------------
Subject: vt-binding-add-sysfs-control-to-the-vt-layer-fix
From: Andrew Morton <akpm@xxxxxxxx>
drivers/char/vt.c: In function 'vtconsole_init_class_device':
drivers/char/vt.c:3021: warning: ISO C90 forbids mixed declarations and code
drivers/char/vt.c: In function 'vtconsole_class_init':
drivers/char/vt.c:3218: warning: ISO C90 forbids mixed declarations and code
Cc: Antonino Daplas <adaplas@xxxxxxx>
Cc: Greg KH <greg@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/char/vt.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff -puN drivers/char/vt.c~vt-binding-add-sysfs-control-to-the-vt-layer-fix drivers/char/vt.c
--- a/drivers/char/vt.c~vt-binding-add-sysfs-control-to-the-vt-layer-fix
+++ a/drivers/char/vt.c
@@ -3017,9 +3017,9 @@ static struct class_device_attribute cla
static int vtconsole_init_class_device(struct con_driver *con)
{
- class_set_devdata(con->class_dev, con);
int i;
+ class_set_devdata(con->class_dev, con);
for (i = 0; i < ARRAY_SIZE(class_device_attrs); i++)
class_device_create_file(con->class_dev,
&class_device_attrs[i]);
@@ -3034,7 +3034,7 @@ static void vtconsole_deinit_class_devic
for (i = 0; i < ARRAY_SIZE(class_device_attrs); i++)
class_device_remove_file(con->class_dev,
&class_device_attrs[i]);
-};
+}
/**
* con_is_bound - checks if driver is bound to the console
@@ -3214,9 +3214,9 @@ void give_up_console(const struct consw
static int __init vtconsole_class_init(void)
{
- vtconsole_class = class_create(THIS_MODULE, "vtconsole");
int i;
+ vtconsole_class = class_create(THIS_MODULE, "vtconsole");
if (IS_ERR(vtconsole_class)) {
printk(KERN_WARNING "Unable to create vt console class; "
"errno = %ld\n", PTR_ERR(vtconsole_class));
_
Patches currently in -mm which might be from akpm@xxxxxxxx are
origin.patch
hangcheck-remove-monotomic_clock-on-x86.patch
savagefb-add-state-save-and_restore-hooks.patch
au1100fb-add-power-management-support.patch
imacfb-add-intel-based-macintosh-framebuffer-support.patch
vt-binding-add-sysfs-control-to-the-vt-layer.patch
vt-binding-add-sysfs-control-to-the-vt-layer-fix.patch
lib-add-idr_replace-tidy.patch
genirq-rename-desc-handler-to-desc-chip-power-fix.patch
genirq-rename-desc-handler-to-desc-chip-ia64-fix.patch
genirq-rename-desc-handler-to-desc-chip-ia64-fix-2.patch
genirq-rename-desc-handler-to-desc-chip-terminate_irqs-fix.patch
genirq-ia64-build-fix.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
