diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-04-08 07:36:36 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-04-08 07:37:18 -0400 |
| commit | ca7e0c612005937a4a5a75d3fed90459993de65c (patch) | |
| tree | b574fc0f0189b52ffc87ba20c418228db556faa1 /drivers/mtd/nand/fsl_upm.c | |
| parent | 8141d0050d76e5695011b5ab577ec66fb51a998c (diff) | |
| parent | f5284e7635787224dda1a2bf82a4c56b1c75671f (diff) | |
Merge branch 'linus' into perf/core
Semantic conflict: arch/x86/kernel/cpu/perf_event_intel_ds.c
Merge reason: pick up latest fixes, fix the conflict
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/mtd/nand/fsl_upm.c')
| -rw-r--r-- | drivers/mtd/nand/fsl_upm.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/mtd/nand/fsl_upm.c b/drivers/mtd/nand/fsl_upm.c index 071a60cb4204..4b96296af321 100644 --- a/drivers/mtd/nand/fsl_upm.c +++ b/drivers/mtd/nand/fsl_upm.c | |||
| @@ -21,6 +21,7 @@ | |||
| 21 | #include <linux/of_platform.h> | 21 | #include <linux/of_platform.h> |
| 22 | #include <linux/of_gpio.h> | 22 | #include <linux/of_gpio.h> |
| 23 | #include <linux/io.h> | 23 | #include <linux/io.h> |
| 24 | #include <linux/slab.h> | ||
| 24 | #include <asm/fsl_lbc.h> | 25 | #include <asm/fsl_lbc.h> |
| 25 | 26 | ||
| 26 | #define FSL_UPM_WAIT_RUN_PATTERN 0x1 | 27 | #define FSL_UPM_WAIT_RUN_PATTERN 0x1 |