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
/
s3cmci.h
diff --git
a/drivers/mmc/host/s3cmci.h
b/drivers/mmc/host/s3cmci.h
index
37d9c60
..
ca1ba3d
100644
(file)
--- a/
drivers/mmc/host/s3cmci.h
+++ b/
drivers/mmc/host/s3cmci.h
@@
-51,7
+51,7
@@
struct s3cmci_host {
int dma_complete;
u32 pio_sgptr;
int dma_complete;
u32 pio_sgptr;
- u32 pio_
word
s;
+ u32 pio_
byte
s;
u32 pio_count;
u32 *pio_ptr;
#define XFER_NONE 0
u32 pio_count;
u32 *pio_ptr;
#define XFER_NONE 0
@@
-67,4
+67,8
@@
struct s3cmci_host {
unsigned int ccnt, dcnt;
struct tasklet_struct pio_tasklet;
unsigned int ccnt, dcnt;
struct tasklet_struct pio_tasklet;
+
+#ifdef CONFIG_CPU_FREQ
+ struct notifier_block freq_transition;
+#endif
};
};