ath9k: merge a channel change fix from linux-wireless (backport of r29684)
[openwrt-10.03/.git] / target / linux / rdc / patches-2.6.30 / 012-export_erase_write.patch
1 --- a/drivers/mtd/mtdblock.c
2 +++ b/drivers/mtd/mtdblock.c
3 @@ -45,7 +45,7 @@ static void erase_callback(struct erase_
4         wake_up(wait_q);
5  }
6  
7 -static int erase_write (struct mtd_info *mtd, unsigned long pos,
8 +int erase_write (struct mtd_info *mtd, unsigned long pos,
9                         int len, const char *buf)
10  {
11         struct erase_info erase;
12 --- a/include/linux/mtd/mtd.h
13 +++ b/include/linux/mtd/mtd.h
14 @@ -319,6 +319,10 @@ int default_mtd_writev(struct mtd_info *
15  int default_mtd_readv(struct mtd_info *mtd, struct kvec *vecs,
16                       unsigned long count, loff_t from, size_t *retlen);
17  
18 +int erase_write (struct mtd_info *mtd, unsigned long pos,
19 +                     int len, const char *buf);
20 +
21 +
22  #ifdef CONFIG_MTD_PARTITIONS
23  void mtd_erase_callback(struct erase_info *instr);
24  #else