diff options
author | David S. Miller <davem@davemloft.net> | 2010-03-15 19:23:54 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-03-15 19:23:54 -0400 |
commit | 4961e02f1999e1c3468c09b2669c94d7c3ae82a8 (patch) | |
tree | 44c15abb09d7ba5e17a9aba95ee246648b1c1a8a /drivers/isdn | |
parent | d14a0ebda7d3daede1a99c01527affb9ceaa4c22 (diff) | |
parent | a3d3203e4bb40f253b1541e310dc0f9305be7c84 (diff) |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Diffstat (limited to 'drivers/isdn')
-rw-r--r-- | drivers/isdn/hardware/mISDN/mISDNisar.c | 4 | ||||
-rw-r--r-- | drivers/isdn/i4l/isdn_common.c | 2 | ||||
-rw-r--r-- | drivers/isdn/mISDN/dsp_core.c | 4 | ||||
-rw-r--r-- | drivers/isdn/mISDN/l1oip_core.c | 4 | ||||
-rw-r--r-- | drivers/isdn/sc/hardware.h | 2 |
5 files changed, 8 insertions, 8 deletions
diff --git a/drivers/isdn/hardware/mISDN/mISDNisar.c b/drivers/isdn/hardware/mISDN/mISDNisar.c index 09095c747110..f0bc6fa95809 100644 --- a/drivers/isdn/hardware/mISDN/mISDNisar.c +++ b/drivers/isdn/hardware/mISDN/mISDNisar.c | |||
@@ -1712,13 +1712,13 @@ mISDNisar_init(struct isar_hw *isar, void *hw) | |||
1712 | } | 1712 | } |
1713 | EXPORT_SYMBOL(mISDNisar_init); | 1713 | EXPORT_SYMBOL(mISDNisar_init); |
1714 | 1714 | ||
1715 | static int isar_mod_init(void) | 1715 | static int __init isar_mod_init(void) |
1716 | { | 1716 | { |
1717 | pr_notice("mISDN: ISAR driver Rev. %s\n", ISAR_REV); | 1717 | pr_notice("mISDN: ISAR driver Rev. %s\n", ISAR_REV); |
1718 | return 0; | 1718 | return 0; |
1719 | } | 1719 | } |
1720 | 1720 | ||
1721 | static void isar_mod_cleanup(void) | 1721 | static void __exit isar_mod_cleanup(void) |
1722 | { | 1722 | { |
1723 | pr_notice("mISDN: ISAR module unloaded\n"); | 1723 | pr_notice("mISDN: ISAR module unloaded\n"); |
1724 | } | 1724 | } |
diff --git a/drivers/isdn/i4l/isdn_common.c b/drivers/isdn/i4l/isdn_common.c index adb1e8c36b46..00c60e2e0ff7 100644 --- a/drivers/isdn/i4l/isdn_common.c +++ b/drivers/isdn/i4l/isdn_common.c | |||
@@ -1347,7 +1347,7 @@ isdn_ioctl(struct inode *inode, struct file *file, uint cmd, ulong arg) | |||
1347 | /* | 1347 | /* |
1348 | * isdn net devices manage lots of configuration variables as linked lists. | 1348 | * isdn net devices manage lots of configuration variables as linked lists. |
1349 | * Those lists must only be manipulated from user space. Some of the ioctl's | 1349 | * Those lists must only be manipulated from user space. Some of the ioctl's |
1350 | * service routines access user space and are not atomic. Therefor, ioctl's | 1350 | * service routines access user space and are not atomic. Therefore, ioctl's |
1351 | * manipulating the lists and ioctl's sleeping while accessing the lists | 1351 | * manipulating the lists and ioctl's sleeping while accessing the lists |
1352 | * are serialized by means of a semaphore. | 1352 | * are serialized by means of a semaphore. |
1353 | */ | 1353 | */ |
diff --git a/drivers/isdn/mISDN/dsp_core.c b/drivers/isdn/mISDN/dsp_core.c index 43ff4d3b046e..6eac588e0a37 100644 --- a/drivers/isdn/mISDN/dsp_core.c +++ b/drivers/isdn/mISDN/dsp_core.c | |||
@@ -1114,7 +1114,7 @@ static struct Bprotocol DSP = { | |||
1114 | .create = dspcreate | 1114 | .create = dspcreate |
1115 | }; | 1115 | }; |
1116 | 1116 | ||
1117 | static int dsp_init(void) | 1117 | static int __init dsp_init(void) |
1118 | { | 1118 | { |
1119 | int err; | 1119 | int err; |
1120 | int tics; | 1120 | int tics; |
@@ -1212,7 +1212,7 @@ static int dsp_init(void) | |||
1212 | } | 1212 | } |
1213 | 1213 | ||
1214 | 1214 | ||
1215 | static void dsp_cleanup(void) | 1215 | static void __exit dsp_cleanup(void) |
1216 | { | 1216 | { |
1217 | mISDN_unregister_Bprotocol(&DSP); | 1217 | mISDN_unregister_Bprotocol(&DSP); |
1218 | 1218 | ||
diff --git a/drivers/isdn/mISDN/l1oip_core.c b/drivers/isdn/mISDN/l1oip_core.c index f1e8af54dff0..325b1ad7d4b8 100644 --- a/drivers/isdn/mISDN/l1oip_core.c +++ b/drivers/isdn/mISDN/l1oip_core.c | |||
@@ -477,7 +477,7 @@ l1oip_socket_parse(struct l1oip *hc, struct sockaddr_in *sin, u8 *buf, int len) | |||
477 | printk(KERN_DEBUG "%s: received frame, parsing... (%d)\n", | 477 | printk(KERN_DEBUG "%s: received frame, parsing... (%d)\n", |
478 | __func__, len); | 478 | __func__, len); |
479 | 479 | ||
480 | /* check lenght */ | 480 | /* check length */ |
481 | if (len < 1+1+2) { | 481 | if (len < 1+1+2) { |
482 | printk(KERN_WARNING "%s: packet error - length %d below " | 482 | printk(KERN_WARNING "%s: packet error - length %d below " |
483 | "4 bytes\n", __func__, len); | 483 | "4 bytes\n", __func__, len); |
@@ -1509,7 +1509,7 @@ l1oip_init(void) | |||
1509 | printk(KERN_DEBUG "%s: interface %d is %s with %s.\n", | 1509 | printk(KERN_DEBUG "%s: interface %d is %s with %s.\n", |
1510 | __func__, l1oip_cnt, pri ? "PRI" : "BRI", | 1510 | __func__, l1oip_cnt, pri ? "PRI" : "BRI", |
1511 | bundle ? "bundled IP packet for all B-channels" : | 1511 | bundle ? "bundled IP packet for all B-channels" : |
1512 | "seperate IP packets for every B-channel"); | 1512 | "separate IP packets for every B-channel"); |
1513 | 1513 | ||
1514 | hc = kzalloc(sizeof(struct l1oip), GFP_ATOMIC); | 1514 | hc = kzalloc(sizeof(struct l1oip), GFP_ATOMIC); |
1515 | if (!hc) { | 1515 | if (!hc) { |
diff --git a/drivers/isdn/sc/hardware.h b/drivers/isdn/sc/hardware.h index 9e6d5302bf8e..627324856ead 100644 --- a/drivers/isdn/sc/hardware.h +++ b/drivers/isdn/sc/hardware.h | |||
@@ -87,7 +87,7 @@ | |||
87 | #define BRI_CHANNELS 2 /* Number of B channels */ | 87 | #define BRI_CHANNELS 2 /* Number of B channels */ |
88 | #define BRI_BASEPG_VAL 0x98 | 88 | #define BRI_BASEPG_VAL 0x98 |
89 | #define BRI_MAGIC 0x60000 /* Magic Number */ | 89 | #define BRI_MAGIC 0x60000 /* Magic Number */ |
90 | #define BRI_MEMSIZE 0x10000 /* Ammount of RAM (64K) */ | 90 | #define BRI_MEMSIZE 0x10000 /* Amount of RAM (64K) */ |
91 | #define BRI_PARTNO "72-029" | 91 | #define BRI_PARTNO "72-029" |
92 | #define BRI_FEATURES ISDN_FEATURE_L2_HDLC | ISDN_FEATURE_L3_TRANS; | 92 | #define BRI_FEATURES ISDN_FEATURE_L2_HDLC | ISDN_FEATURE_L3_TRANS; |
93 | /* | 93 | /* |