Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

This commit is contained in:
David Woodhouse 2006-12-01 09:56:43 +00:00
commit bd3c97a7c7
1188 changed files with 14713 additions and 10015 deletions

View file

@ -1086,7 +1086,7 @@ static int inval_cache_and_wait_for_operation(
}
spin_lock(chip->mutex);
if (chip->state != chip_state) {
while (chip->state != chip_state) {
/* Someone's suspended the operation: sleep */
DECLARE_WAITQUEUE(wait, current);
set_current_state(TASK_UNINTERRUPTIBLE);

View file

@ -1493,6 +1493,7 @@ static void nand_write_page_syndrome(struct mtd_info *mtd,
* @buf: the data to write
* @page: page number to write
* @cached: cached programming
* @raw: use _raw version of write_page
*/
static int nand_write_page(struct mtd_info *mtd, struct nand_chip *chip,
const uint8_t *buf, int page, int cached, int raw)