Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / include / linux / connector.h

diff --git a/include/linux/connector.h b/include/linux/connector.h
index 70817a9968be20bba98670e3d1332141217901a0..fd722f3cb6bd362320b12f191e2e81a19380a602 100644 (file)
--- a/include/linux/connector.h
+++ b/include/linux/connector.h
@@ -172,7 +172,5 @@ int cn_cb_equal(struct cb_id *, struct cb_id *);
 
 void cn_queue_wrapper(struct work_struct *work);
 
-extern int cn_already_initialized;
-
 #endif                         /* __KERNEL__ */
 #endif                         /* __CONNECTOR_H */