summaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorWilliam Juul <william.juul@datarespons.no>2007-11-09 13:32:30 +0100
committerScott Wood <scottwood@freescale.com>2008-08-12 11:31:17 -0500
commit5e1dae5c3db7f4026f31b6a2a81ecd9e9dee475f (patch)
tree7276d7e752d241d719b2470c7d189cd9760982e4 /include/linux
parent4cbb651b29cb64d378a06729970e1e153bb605b1 (diff)
Fixing coding style issues
- Fixing leading white spaces - Fixing indentation where 4 spaces are used instead of tab - Removing C++ comments (//), wherever I introduced them Signed-off-by: William Juul <william.juul@tandberg.com> Signed-off-by: Scott Wood <scottwood@freescale.com>
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/mtd/compat.h6
-rw-r--r--include/linux/mtd/nand.h7
2 files changed, 7 insertions, 6 deletions
diff --git a/include/linux/mtd/compat.h b/include/linux/mtd/compat.h
index 86a6e43ca9a..9036b74f86e 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 2984f5f282f..f9b7d36a73a 100644
--- a/include/linux/mtd/nand.h
+++ b/include/linux/mtd/nand.h
@@ -236,11 +236,12 @@ struct nand_chip;
* 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;
};
/**