diff --git a/include/linux/mtd/compat.h b/include/linux/mtd/compat.h
index 86a6e43..9036b74 100644
--- a/include/linux/mtd/compat.h
+++ b/include/linux/mtd/compat.h
@@ -18,10 +18,10 @@
 #define KERN_DEBUG
 
 #define kmalloc(size, flags)	malloc(size)
-#define kzalloc(size, flags)    calloc(size, 1)
+#define kzalloc(size, flags)	calloc(size, 1)
 #define vmalloc(size)			malloc(size)
-#define kfree(ptr)		        free(ptr)
-#define vfree(ptr)              free(ptr)
+#define kfree(ptr)				free(ptr)
+#define vfree(ptr)				free(ptr)
 
 #define KERNEL_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))
 
diff --git a/include/linux/mtd/nand.h b/include/linux/mtd/nand.h
index 2984f5f..f9b7d36 100644
--- a/include/linux/mtd/nand.h
+++ b/include/linux/mtd/nand.h
@@ -236,11 +236,12 @@
  *                      used instead of the per chip wait queue when a hw controller is available
  */
 struct nand_hw_control {
+/* XXX U-BOOT XXX */
 #if 0
-    spinlock_t	 lock;
-    wait_queue_head_t wq;
+	spinlock_t	 lock;
+	wait_queue_head_t wq;
 #endif
-    struct nand_chip *active;
+	struct nand_chip *active;
 };
 
 /**