diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-04-07 12:05:21 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-04-07 12:05:25 +0200 |
| commit | 6c009ecef8cca28c7c09eb16d0802e37915a76e1 (patch) | |
| tree | 11c773f780186fdb9fbc9c80a73fb7c8426b1fba /drivers/mtd/devices/docecc.c | |
| parent | 98c2aaf8be5baf7193be37fb28bce8e7327158bc (diff) | |
| parent | d508afb437daee7cf07da085b635c44a4ebf9b38 (diff) | |
| download | talos-op-linux-6c009ecef8cca28c7c09eb16d0802e37915a76e1.tar.gz talos-op-linux-6c009ecef8cca28c7c09eb16d0802e37915a76e1.zip | |
Merge branch 'linus' into perfcounters/core
Merge reason: need the upstream facility added by:
7f1e2ca: hrtimer: fix rq->lock inversion (again)
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/mtd/devices/docecc.c')
| -rw-r--r-- | drivers/mtd/devices/docecc.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/mtd/devices/docecc.c b/drivers/mtd/devices/docecc.c index 874e51b110a2..a19cda52da5c 100644 --- a/drivers/mtd/devices/docecc.c +++ b/drivers/mtd/devices/docecc.c @@ -26,7 +26,6 @@ #include <asm/errno.h> #include <asm/io.h> #include <asm/uaccess.h> -#include <linux/miscdevice.h> #include <linux/delay.h> #include <linux/slab.h> #include <linux/init.h> |
