diff options
| author | John W. Linville <linville@tuxdriver.com> | 2011-04-07 16:45:40 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-04-07 16:45:40 -0400 |
| commit | b37e3b6d64358604960b35e8ecbb7aed22e0926e (patch) | |
| tree | f9673afc2332c15a989d3b32f002363a92ea66e1 /net/atm/common.c | |
| parent | a90c7a313a1c5b4fc99f987a2ae8f92ab0ae35c7 (diff) | |
| parent | bd39a274fb7b43374c797bafdb7f506598f36f77 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Conflicts:
drivers/net/wireless/rtlwifi/efuse.c
drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c
net/bluetooth/mgmt.c
Diffstat (limited to 'net/atm/common.c')
| -rw-r--r-- | net/atm/common.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/atm/common.c b/net/atm/common.c index 1b9c52a02cd3..22b963d06a10 100644 --- a/net/atm/common.c +++ b/net/atm/common.c | |||
| @@ -252,6 +252,7 @@ void atm_dev_release_vccs(struct atm_dev *dev) | |||
| 252 | } | 252 | } |
| 253 | write_unlock_irq(&vcc_sklist_lock); | 253 | write_unlock_irq(&vcc_sklist_lock); |
| 254 | } | 254 | } |
| 255 | EXPORT_SYMBOL(atm_dev_release_vccs); | ||
| 255 | 256 | ||
| 256 | static int adjust_tp(struct atm_trafprm *tp, unsigned char aal) | 257 | static int adjust_tp(struct atm_trafprm *tp, unsigned char aal) |
| 257 | { | 258 | { |