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 git://git.infradead.org/mtd-2.6
[pandora-kernel.git]
/
include
/
linux
/
connector.h
diff --git
a/include/linux/connector.h
b/include/linux/connector.h
index
13fc454
..
5c7f946
100644
(file)
--- a/
include/linux/connector.h
+++ b/
include/linux/connector.h
@@
-38,8
+38,9
@@
#define CN_W1_VAL 0x1
#define CN_IDX_V86D 0x4
#define CN_VAL_V86D_UVESAFB 0x1
#define CN_W1_VAL 0x1
#define CN_IDX_V86D 0x4
#define CN_VAL_V86D_UVESAFB 0x1
+#define CN_IDX_BB 0x5 /* BlackBoard, from the TSP GPL sampling framework */
-#define CN_NETLINK_USERS
5
+#define CN_NETLINK_USERS
6
/*
* Maximum connector's message size.
/*
* Maximum connector's message size.
@@
-112,7
+113,6
@@
struct cn_queue_dev {
struct list_head queue_list;
spinlock_t queue_lock;
struct list_head queue_list;
spinlock_t queue_lock;
- int netlink_groups;
struct sock *nls;
};
struct sock *nls;
};
@@
-133,15
+133,13
@@
struct cn_callback_data {
struct cn_callback_entry {
struct list_head callback_entry;
struct cn_callback_entry {
struct list_head callback_entry;
- struct cn_callback *cb;
struct work_struct work;
struct cn_queue_dev *pdev;
struct cn_callback_id id;
struct cn_callback_data data;
struct work_struct work;
struct cn_queue_dev *pdev;
struct cn_callback_id id;
struct cn_callback_data data;
- int seq, group;
- struct sock *nls;
+ u32 seq, group;
};
struct cn_ctl_entry {
};
struct cn_ctl_entry {
@@
-173,7
+171,5
@@
int cn_cb_equal(struct cb_id *, struct cb_id *);
void cn_queue_wrapper(struct work_struct *work);
void cn_queue_wrapper(struct work_struct *work);
-extern int cn_already_initialized;
-
#endif /* __KERNEL__ */
#endif /* __CONNECTOR_H */
#endif /* __KERNEL__ */
#endif /* __CONNECTOR_H */