diff -urN linux-2.6.20/arch/arm/mach-mv88fxx81/LSP/Kconfig linux-2.6.20-arm9-mvsata/arch/arm/mach-mv88fxx81/LSP/Kconfig
--- linux-2.6.20/arch/arm/mach-mv88fxx81/LSP/Kconfig	2007-09-02 00:14:21.000000000 +0900
+++ linux-2.6.20-arm9-mvsata/arch/arm/mach-mv88fxx81/LSP/Kconfig	2007-09-02 00:13:11.000000000 +0900
@@ -118,14 +118,6 @@
 
 endmenu
 
-config  SCSI_MVSATA
-	tristate "Support for Marvell Sata Adapters"
-	depends on PCI && SCSI
-	---help---
-	  Choosing this option will enable you to use the Marvell Sata 
-	  adapters support with emulation as SCSI adapters. 
-	  Note that the kernel scsi subsystem must be chosen too.
-
 config  MV88fxx81_PROC
 	bool "Support for MV-shell proc file system"
 	depends on PROC_FS
diff -urN linux-2.6.20/drivers/scsi/marvell/Makefile linux-2.6.20-arm9-mvsata/drivers/scsi/marvell/Makefile
--- linux-2.6.20/drivers/scsi/marvell/Makefile	2007-09-02 00:14:28.000000000 +0900
+++ linux-2.6.20-arm9-mvsata/drivers/scsi/marvell/Makefile	2007-09-02 00:11:39.000000000 +0900
@@ -2,5 +2,8 @@
 
 mv_sata-objs	:= mvSata.o mvStorageDev.o mvLinuxIalLib.o mvLinuxIalHt.o mvLinuxIalOs.o mvIALCommon.o mvLinuxIalSmart.o mvScsiAtaLayer.o mvLog.o mvIALCommonUtils.o
 
+obj-$(CONFIG_SCSI_MARVEL) := $(obj-m)
 EXTRA_CFLAGS	:= -Idrivers/scsi
-
+ifdef CONFIG_ARCH_MV88fxx81
+include $(TOPDIR)/arch/arm/mach-mv88fxx81/mv88f5181/mvRules.mk
+endif
diff -urN linux-2.6.20/drivers/scsi/marvell/mvOs.h linux-2.6.20-arm9-mvsata/drivers/scsi/marvell/mvOs.h
--- linux-2.6.20/drivers/scsi/marvell/mvOs.h	2007-09-02 00:14:28.000000000 +0900
+++ linux-2.6.20-arm9-mvsata/drivers/scsi/marvell/mvOs.h	2007-09-02 00:11:39.000000000 +0900
@@ -125,6 +125,7 @@
 #define MV_REG_READ_DWORD(base, offset)         readl(base + offset)
 
 
+#ifndef __INCmvTypesh
 /* Typedefs    */
 typedef enum mvBoolean{MV_FALSE, MV_TRUE} MV_BOOLEAN;
 
@@ -133,6 +134,9 @@
 typedef u32             MV_U32;
 typedef u16             MV_U16;
 typedef u8              MV_U8;
+#else
+typedef int		 MV_BOOLEAN;
+#endif
 typedef void            *MV_VOID_PTR;
 typedef u32             *MV_U32_PTR;
 typedef u16             *MV_U16_PTR;