Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts: drivers/mtd/mtdcore.c Pull in the bdi fixes and ARM platform changes that other outstanding patches depend on.
This commit is contained in:
@@ -26,6 +26,7 @@
|
||||
*/
|
||||
#include <linux/mtd/pfow.h>
|
||||
#include <linux/mtd/qinfo.h>
|
||||
#include <linux/slab.h>
|
||||
|
||||
static int lpddr_read(struct mtd_info *mtd, loff_t adr, size_t len,
|
||||
size_t *retlen, u_char *buf);
|
||||
|
Reference in New Issue
Block a user