diff --git a/platform/msb430/cfs-coffee-arch.c b/platform/msb430/cfs-coffee-arch.c
index 4690291b9..0db47488e 100644
--- a/platform/msb430/cfs-coffee-arch.c
+++ b/platform/msb430/cfs-coffee-arch.c
@@ -49,7 +49,6 @@ cfs_coffee_arch_erase(unsigned sector)
   sd_offset_t start_offset;
   sd_offset_t end_offset;
   sd_offset_t offset;
-  int r;
 
   memset(buf, 0, sizeof(buf));
 
@@ -57,7 +56,7 @@ cfs_coffee_arch_erase(unsigned sector)
   end_offset = start_offset + COFFEE_SECTOR_SIZE;
 
   for(offset = start_offset; offset < end_offset; offset += SD_BLOCK_SIZE) {
-    if(sd_rio_write(offset, buf, sizeof(buf)) < 0) {
+    if(sd_write(offset, buf, sizeof(buf)) < 0) {
       return -1;
     }
   }
diff --git a/platform/msb430/cfs-coffee-arch.h b/platform/msb430/cfs-coffee-arch.h
index d03f436c0..995904f01 100644
--- a/platform/msb430/cfs-coffee-arch.h
+++ b/platform/msb430/cfs-coffee-arch.h
@@ -41,7 +41,7 @@
 #define CFS_COFFEE_ARCH_H
 
 #include "contiki-conf.h"
-#include "dev/sd_rio.h"
+#include "dev/sd.h"
 
 /* Coffee configuration parameters. */
 #define COFFEE_SECTOR_SIZE		(10*1024*1024UL)
@@ -59,10 +59,10 @@
 
 /* Flash operations. */
 #define COFFEE_WRITE(buf, size, offset)				\
-		sd_rio_write(COFFEE_START + (offset), (char *)(buf), (size))
+		sd_write(COFFEE_START + (offset), (char *)(buf), (size))
 
 #define COFFEE_READ(buf, size, offset)				\
-  		sd_rio_read(COFFEE_START + (offset), (char *)buf, (size))
+  		sd_read(COFFEE_START + (offset), (char *)buf, (size))
 
 #define COFFEE_ERASE(sector)					\
 		cfs_coffee_arch_erase(sector)