git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ../mmc
[pandora-kernel.git]
/
drivers
/
mmc
/
host
/
mmci.h
diff --git
a/drivers/mmc/host/mmci.h
b/drivers/mmc/host/mmci.h
index
6d7eadc
..
0f39c49
100644
(file)
--- a/
drivers/mmc/host/mmci.h
+++ b/
drivers/mmc/host/mmci.h
@@
-1,5
+1,5
@@
/*
/*
- * linux/drivers/mmc/mmci.h - ARM PrimeCell MMCI PL180/1 driver
+ * linux/drivers/mmc/
host/
mmci.h - ARM PrimeCell MMCI PL180/1 driver
*
* Copyright (C) 2003 Deep Blue Solutions, Ltd, All Rights Reserved.
*
*
* Copyright (C) 2003 Deep Blue Solutions, Ltd, All Rights Reserved.
*
@@
-169,7
+169,7
@@
static inline char *mmci_kmap_atomic(struct mmci_host *host, unsigned long *flag
struct scatterlist *sg = host->sg_ptr;
local_irq_save(*flags);
struct scatterlist *sg = host->sg_ptr;
local_irq_save(*flags);
- return kmap_atomic(sg
->page
, KM_BIO_SRC_IRQ) + sg->offset;
+ return kmap_atomic(sg
_page(sg)
, KM_BIO_SRC_IRQ) + sg->offset;
}
static inline void mmci_kunmap_atomic(struct mmci_host *host, void *buffer, unsigned long *flags)
}
static inline void mmci_kunmap_atomic(struct mmci_host *host, void *buffer, unsigned long *flags)