git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge to kernel-2.6.20-1.2949.fc6.vs2.2.0.1
[linux-2.6.git]
/
include
/
asm-arm
/
hardware
/
ssp.h
diff --git
a/include/asm-arm/hardware/ssp.h
b/include/asm-arm/hardware/ssp.h
index
28aa11b
..
3b42e18
100644
(file)
--- a/
include/asm-arm/hardware/ssp.h
+++ b/
include/asm-arm/hardware/ssp.h
@@
-16,8
+16,8
@@
struct ssp_state {
};
int ssp_write_word(u16 data);
-int ssp_read_word(
void
);
-
void
ssp_flush(void);
+int ssp_read_word(
u16 *data
);
+
int
ssp_flush(void);
void ssp_enable(void);
void ssp_disable(void);
void ssp_save_state(struct ssp_state *ssp);