diff --git a/conf/i386.rmk b/conf/i386.rmk
index 3d7f42804..bf2b80821 100644
--- a/conf/i386.rmk
+++ b/conf/i386.rmk
@@ -56,6 +56,12 @@ pci_mod_SOURCES = bus/pci.c
 pci_mod_CFLAGS = $(COMMON_CFLAGS)
 pci_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
+# For cs5536.mod
+pkglib_MODULES += cs5536.mod
+cs5536_mod_SOURCES = bus/cs5536.c
+cs5536_mod_CFLAGS = $(COMMON_CFLAGS)
+cs5536_mod_LDFLAGS = $(COMMON_LDFLAGS)
+
 # For lspci.mod
 pkglib_MODULES += lspci.mod
 lspci_mod_SOURCES = commands/lspci.c
diff --git a/include/grub/i386/pci.h b/include/grub/i386/pci.h
index bab42adb6..795dec58b 100644
--- a/include/grub/i386/pci.h
+++ b/include/grub/i386/pci.h
@@ -80,7 +80,7 @@ grub_pci_device_map_range (grub_pci_device_t dev __attribute__ ((unused)),
 
 static inline void
 grub_pci_device_unmap_range (grub_pci_device_t dev __attribute__ ((unused)),
-			     void *mem __attribute__ ((unused)),
+			     volatile void *mem __attribute__ ((unused)),
 			     grub_size_t size __attribute__ ((unused)))
 {
 }