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 'sh-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[pandora-kernel.git]
/
include
/
linux
/
ceph
/
libceph.h
diff --git
a/include/linux/ceph/libceph.h
b/include/linux/ceph/libceph.h
index
0d2e0ff
..
6365f04
100644
(file)
--- a/
include/linux/ceph/libceph.h
+++ b/
include/linux/ceph/libceph.h
@@
-61,7
+61,7
@@
struct ceph_options {
pointer type of args */
int num_mon;
char *name;
-
char *secret
;
+
struct ceph_crypto_key *key
;
};
/*