Merge branch 'core/rcu' into core/rcu-for-linus

[linux-2.6] / drivers / mmc / host / au1xmmc.c

diff --git a/drivers/mmc/host/au1xmmc.c b/drivers/mmc/host/au1xmmc.c
index b2104d4f87afec75d07768874c9184dcbc33033c..cc5f7bc546afc95d5379faca5634a1f439363e50 100644 (file)
--- a/drivers/mmc/host/au1xmmc.c
+++ b/drivers/mmc/host/au1xmmc.c
@@ -40,7 +40,7 @@
 #include <linux/mm.h>
 #include <linux/interrupt.h>
 #include <linux/dma-mapping.h>
-#include <scatterlist/scatterlist.h>
+#include <linux/scatterlist.h>
 
 #include <linux/mmc/host.h>
 #include <asm/io.h>
@@ -998,6 +998,7 @@ static struct platform_driver au1xmmc_driver = {
        .resume        = NULL,
        .driver        = {
                .name  = DRIVER_NAME,
+               .owner = THIS_MODULE,
        },
 };
 
@@ -1018,5 +1019,6 @@ module_exit(au1xmmc_exit);
 MODULE_AUTHOR("Advanced Micro Devices, Inc");
 MODULE_DESCRIPTION("MMC/SD driver for the Alchemy Au1XXX");
 MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:au1xxx-mmc");
 #endif