Merge tag 'disintegrate-mtd-20121009' of git://git.infradead.org/users/dhowells/linux-headers

UAPI Disintegration 2012-10-09

Conflicts:
	MAINTAINERS
	arch/arm/configs/bcmring_defconfig
	arch/arm/mach-imx/clk-imx51-imx53.c
	drivers/mtd/nand/Kconfig
	drivers/mtd/nand/bcm_umi_nand.c
	drivers/mtd/nand/nand_bcm_umi.h
	drivers/mtd/nand/orion_nand.c

1 files changed, 2 insertions, 1 deletions

diff --git a/arch/sparc/kernel/hvapi.c b/arch/sparc/kernel/hvapi.c
index 8593672838fd..c0a2de0fd624 100644
--- a/arch/sparc/kernel/hvapi.c
+++ b/arch/sparc/kernel/hvapi.c
@@ -45,6 +45,7 @@ static struct api_info api_table[] = {
         { .group = HV_GRP_NIU,                                  },
         { .group = HV_GRP_VF_CPU,                               },
         { .group = HV_GRP_KT_CPU,                               },
+        { .group = HV_GRP_VT_CPU,                               },
         { .group = HV_GRP_DIAG,         .flags = FLAG_PRE_API   },
 };
 
@@ -193,7 +194,7 @@ void __init sun4v_hvapi_init(void)
 
 bad:
         prom_printf("HVAPI: Cannot register API group "
-                    "%lx with major(%u) minor(%u)\n",
+                    "%lx with major(%lu) minor(%lu)\n",
                     group, major, minor);
         prom_halt();
 }