diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-08-18 15:17:52 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-08-18 15:17:52 +0200 |
| commit | e7cfbea9cb7a02ea29fdae5d39c9e3d09102c4d5 (patch) | |
| tree | 37c20ec03e70dc7b5df1d02f16b6ac38d8ed1364 /include/linux/mtd/mtd.h | |
| parent | 7ac03db84baa204d7d280401ed65842541ed1078 (diff) | |
| parent | 56385a12d9bb9e173751f74b6c430742018cafc0 (diff) | |
| download | linux-stable-e7cfbea9cb7a02ea29fdae5d39c9e3d09102c4d5.tar.gz linux-stable-e7cfbea9cb7a02ea29fdae5d39c9e3d09102c4d5.tar.bz2 linux-stable-e7cfbea9cb7a02ea29fdae5d39c9e3d09102c4d5.zip | |
Merge branch 'fix/misc' into topic/misc
Diffstat (limited to 'include/linux/mtd/mtd.h')
| -rw-r--r-- | include/linux/mtd/mtd.h | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/include/linux/mtd/mtd.h b/include/linux/mtd/mtd.h index 5326435a7571..8485e42a9b09 100644 --- a/include/linux/mtd/mtd.h +++ b/include/linux/mtd/mtd.h @@ -1,7 +1,20 @@ /* - * Copyright (C) 1999-2003 David Woodhouse <dwmw2@infradead.org> et al. + * Copyright © 1999-2010 David Woodhouse <dwmw2@infradead.org> et al. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA * - * Released under GPL */ #ifndef __MTD_MTD_H__ @@ -13,7 +26,6 @@ #include <linux/notifier.h> #include <linux/device.h> -#include <linux/mtd/compatmac.h> #include <mtd/mtd-abi.h> #include <asm/div64.h> @@ -216,6 +228,7 @@ struct mtd_info { /* Chip-supported device locking */ int (*lock) (struct mtd_info *mtd, loff_t ofs, uint64_t len); int (*unlock) (struct mtd_info *mtd, loff_t ofs, uint64_t len); + int (*is_locked) (struct mtd_info *mtd, loff_t ofs, uint64_t len); /* Power Management functions */ int (*suspend) (struct mtd_info *mtd); |