Merge git://git.infradead.org/~dwmw2/mtd-2.6.33
* git://git.infradead.org/~dwmw2/mtd-2.6.33: mtd: tests: fix read, speed and stress tests on NOR flash mtd: Really add ARM pismo support kmsg_dump: Dump on crash_kexec as well
This commit is contained in:
commit
b8be634e01
11 changed files with 379 additions and 5 deletions
|
|
@ -17,6 +17,7 @@
|
|||
enum kmsg_dump_reason {
|
||||
KMSG_DUMP_OOPS,
|
||||
KMSG_DUMP_PANIC,
|
||||
KMSG_DUMP_KEXEC,
|
||||
};
|
||||
|
||||
/**
|
||||
|
|
|
|||
17
include/linux/mtd/pismo.h
Normal file
17
include/linux/mtd/pismo.h
Normal file
|
|
@ -0,0 +1,17 @@
|
|||
/*
|
||||
* PISMO memory driver - http://www.pismoworld.org/
|
||||
*
|
||||
* 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.
|
||||
*/
|
||||
#ifndef __LINUX_MTD_PISMO_H
|
||||
#define __LINUX_MTD_PISMO_H
|
||||
|
||||
struct pismo_pdata {
|
||||
void (*set_vpp)(void *, int);
|
||||
void *vpp_data;
|
||||
phys_addr_t cs_addrs[5];
|
||||
};
|
||||
|
||||
#endif
|
||||
Loading…
Add table
Add a link
Reference in a new issue