aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/sbus/char/jsflash.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-03-12 20:29:17 -0400
committerIngo Molnar <mingo@elte.hu>2009-03-12 20:29:17 -0400
commit3c1f67d60e2b4f4455563928999fd41cc653645d (patch)
tree0d58c145a05fb09167f1ab6882b474eccb1f3563 /drivers/sbus/char/jsflash.c
parent03d78913f01e8f6599823f00357ed17b32747d3d (diff)
parent9ead64974b05501bbac0d63a47c99fa786d064ba (diff)
Merge branch 'linus' into core/locking
Diffstat (limited to 'drivers/sbus/char/jsflash.c')
-rw-r--r--drivers/sbus/char/jsflash.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/sbus/char/jsflash.c b/drivers/sbus/char/jsflash.c
index a9a9893a5f95..e6d1fc8c54f1 100644
--- a/drivers/sbus/char/jsflash.c
+++ b/drivers/sbus/char/jsflash.c
@@ -38,9 +38,6 @@
38#include <linux/string.h> 38#include <linux/string.h>
39#include <linux/genhd.h> 39#include <linux/genhd.h>
40#include <linux/blkdev.h> 40#include <linux/blkdev.h>
41
42#define MAJOR_NR JSFD_MAJOR
43
44#include <asm/uaccess.h> 41#include <asm/uaccess.h>
45#include <asm/pgtable.h> 42#include <asm/pgtable.h>
46#include <asm/io.h> 43#include <asm/io.h>