Merge branch 'hotfixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...

[pandora-kernel.git] / drivers / cdrom / gdrom.c

diff --git a/drivers/cdrom/gdrom.c b/drivers/cdrom/gdrom.c
index 4e2bbcc..1e0455b 100644 (file)
--- a/drivers/cdrom/gdrom.c
+++ b/drivers/cdrom/gdrom.c
@@ -39,8 +39,8 @@
 #include <asm/io.h>
 #include <asm/dma.h>
 #include <asm/delay.h>
-#include <asm/mach/dma.h>
-#include <asm/mach/sysasic.h>
+#include <mach/dma.h>
+#include <mach/sysasic.h>
 
 #define GDROM_DEV_NAME "gdrom"
 #define GD_SESSION_OFFSET 150
@@ -827,7 +827,9 @@ static int __devexit remove_gdrom(struct platform_device *devptr)
        del_gendisk(gd.disk);
        if (gdrom_major)
                unregister_blkdev(gdrom_major, GDROM_DEV_NAME);
-       return unregister_cdrom(gd.cd_info);
+       unregister_cdrom(gd.cd_info);
+
+       return 0;
 }
 
 static struct platform_driver gdrom_driver = {