diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-29 11:29:55 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-29 11:29:55 -0500 |
commit | 219ff3ad611ecfe8a2fd29b8c50a5313c9d15383 (patch) | |
tree | 69a9ad12ed64d0966ec63bb5c4699e3effb5490f /drivers/connector/connector.c | |
parent | 547598d3a91f11b1f802bf0b122f777c3c22f26d (diff) | |
parent | 2335f8ec27e125208d8d2d3e257a82862c4977d6 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (79 commits)
[X25]: Use proc_create() to setup ->proc_fops first
[WANROUTER]: Use proc_create() to setup ->proc_fops first
[8021Q]: Use proc_create() to setup ->proc_fops first
[IPV4]: Use proc_create() to setup ->proc_fops first
[IPV6]: Use proc_create() to setup ->proc_fops first
[SCTP]: Use proc_create() to setup ->proc_fops first
[PKTGEN]: Use proc_create() to setup ->proc_fops first
[NEIGHBOUR]: Use proc_create() to setup ->proc_fops first
[LLC]: Use proc_create() to setup ->proc_fops first
[IPX]: Use proc_create() to setup ->proc_fops first
[SUNRPC]: Use proc_create() to setup ->proc_fops first
[ATM]: Use proc_create() to setup ->proc_fops first
[SCTP]: Update AUTH structures to match declarations in draft-16.
[SCTP]: Incorrect length was used in SCTP_*_AUTH_CHUNKS socket option
[SCTP]: Clean up naming conventions of sctp protocol/address family registration
[APPLETALK]: Use proc_create() to setup ->proc_fops first
[BNX2X]: add bnx2x to MAINTAINERS
[BNX2X]: update version, remove CVS strings
[BNX2X]: Fix Xmit bugs
[BNX2X]: Prevent PCI queue overflow
...
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. |