diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-03-13 05:54:43 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-03-13 05:54:43 +0100 |
commit | 17d85bc7564571a1cce23ffdb2d2a33301876925 (patch) | |
tree | 815bfc3a02e94303c7c834770bf2a17012c10bf8 /drivers/sbus/char/jsflash.c | |
parent | d95c3578120e5bc4784069439f00ccb1b5f87717 (diff) | |
parent | 041b62374c7fedc11a8a1eeda2868612d3d1436c (diff) |
Merge commit 'v2.6.29-rc8' into cpus4096
Diffstat (limited to 'drivers/sbus/char/jsflash.c')
-rw-r--r-- | drivers/sbus/char/jsflash.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/sbus/char/jsflash.c b/drivers/sbus/char/jsflash.c index a9a9893a5f9..e6d1fc8c54f 100644 --- a/drivers/sbus/char/jsflash.c +++ b/drivers/sbus/char/jsflash.c @@ -38,9 +38,6 @@ #include <linux/string.h> #include <linux/genhd.h> #include <linux/blkdev.h> - -#define MAJOR_NR JSFD_MAJOR - #include <asm/uaccess.h> #include <asm/pgtable.h> #include <asm/io.h> |