diff options
author | Paul Mackerras <paulus@samba.org> | 2008-03-03 05:31:09 -0500 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2008-03-03 05:31:09 -0500 |
commit | 3cecdda3f169f22f324f78fd544beee68e3cc6a4 (patch) | |
tree | e7c2995ddc2690d1be695a1525bcd16d3965548d /drivers/connector/connector.c | |
parent | b9c64498f53e0f4d90eec03048f73ac215bb6f79 (diff) | |
parent | da40451bba23b51eaca4170a095891646ce72104 (diff) |
Merge branch 'for-2.6.25' of master.kernel.org:/pub/scm/linux/kernel/git/arnd/cell-2.6 into merge
Diffstat (limited to 'drivers/connector/connector.c')
-rw-r--r-- | drivers/connector/connector.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/connector/connector.c b/drivers/connector/connector.c index fea2d3ed9cbd..85e2ba7fcfba 100644 --- a/drivers/connector/connector.c +++ b/drivers/connector/connector.c | |||
@@ -47,7 +47,7 @@ static LIST_HEAD(notify_list); | |||
47 | 47 | ||
48 | static struct cn_dev cdev; | 48 | static struct cn_dev cdev; |
49 | 49 | ||
50 | int cn_already_initialized = 0; | 50 | static int cn_already_initialized; |
51 | 51 | ||
52 | /* | 52 | /* |
53 | * msg->seq and msg->ack are used to determine message genealogy. | 53 | * msg->seq and msg->ack are used to determine message genealogy. |