Merge branch 'master' into for-next

[mirror_ubuntu-kernels.git] / drivers / tty / serial / mrst_max3110.c

diff --git a/drivers/tty/serial/mrst_max3110.c b/drivers/tty/serial/mrst_max3110.c
index fbd9261a0c2c72ccb2560ee6f5c7134f051dd93f..492c14d63e99c2eeb4b50909e6096efe3d02f7ea 100644 (file)
--- a/drivers/tty/serial/mrst_max3110.c
+++ b/drivers/tty/serial/mrst_max3110.c
@@ -917,4 +917,4 @@ module_init(serial_m3110_init);
 module_exit(serial_m3110_exit);
 
 MODULE_LICENSE("GPL v2");
-MODULE_ALIAS("max3110-uart");
+MODULE_ALIAS("spi:max3110-uart");