diff options
| author | Tejun Heo <tj@kernel.org> | 2010-12-17 09:16:46 -0500 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2010-12-17 09:16:46 -0500 |
| commit | 275c8b93288ef0c2281e414e069ea8ed4bad03f7 (patch) | |
| tree | df906ef901d7719d66944921c7436f5db718dc2f /drivers/mtd/nand/omap2.c | |
| parent | 909ea96468096b07fbb41aaf69be060d92bd9271 (diff) | |
| parent | 8f1d97c79eb65de1d05799d6b81d79cd94169114 (diff) | |
Merge branch 'this_cpu_ops' into for-2.6.38
Diffstat (limited to 'drivers/mtd/nand/omap2.c')
| -rw-r--r-- | drivers/mtd/nand/omap2.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/mtd/nand/omap2.c b/drivers/mtd/nand/omap2.c index cd41c58b5bbd..15682ec8530e 100644 --- a/drivers/mtd/nand/omap2.c +++ b/drivers/mtd/nand/omap2.c | |||
| @@ -7,7 +7,6 @@ | |||
| 7 | * it under the terms of the GNU General Public License version 2 as | 7 | * it under the terms of the GNU General Public License version 2 as |
| 8 | * published by the Free Software Foundation. | 8 | * published by the Free Software Foundation. |
| 9 | */ | 9 | */ |
| 10 | #define CONFIG_MTD_NAND_OMAP_HWECC | ||
| 11 | 10 | ||
| 12 | #include <linux/platform_device.h> | 11 | #include <linux/platform_device.h> |
| 13 | #include <linux/dma-mapping.h> | 12 | #include <linux/dma-mapping.h> |