diff --git a/[refs] b/[refs]
index 5fc6784c10e4..f053953bdbd1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fc3ba9525b50ea0d1670357ece21ebedcee507ae
+refs/heads/master: 4ccdb4c8727c9963c7aa0d6301df283cf1f8a731
diff --git a/trunk/arch/mips/tx4938/toshiba_rbtx4938/setup.c b/trunk/arch/mips/tx4938/toshiba_rbtx4938/setup.c
index 84ebff711e6e..f236b1ff8923 100644
--- a/trunk/arch/mips/tx4938/toshiba_rbtx4938/setup.c
+++ b/trunk/arch/mips/tx4938/toshiba_rbtx4938/setup.c
@@ -1108,7 +1108,7 @@ static void __init txx9_spi_init(unsigned long base, int irq)
 			.flags	= IORESOURCE_IRQ,
 		},
 	};
-	platform_device_register_simple("txx9spi", 0,
+	platform_device_register_simple("spi_txx9", 0,
 					res, ARRAY_SIZE(res));
 }
 
diff --git a/trunk/drivers/spi/spi_txx9.c b/trunk/drivers/spi/spi_txx9.c
index f6c3677035b0..b7f4bb239eaf 100644
--- a/trunk/drivers/spi/spi_txx9.c
+++ b/trunk/drivers/spi/spi_txx9.c
@@ -450,11 +450,10 @@ static int __exit txx9spi_remove(struct platform_device *dev)
 	return 0;
 }
 
-MODULE_ALIAS("txx9spi");			/* for platform bus hotplug */
 static struct platform_driver txx9spi_driver = {
 	.remove = __exit_p(txx9spi_remove),
 	.driver = {
-		.name = "txx9spi",
+		.name = "spi_txx9",
 		.owner = THIS_MODULE,
 	},
 };