diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-06 17:16:19 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-06 17:16:19 -0400 |
| commit | 9aec247d3b213f3c29cfba921cf11deb1ed513cd (patch) | |
| tree | 6ce8272654896b4d0e05b1c82b8d7d3292284676 /include/linux/atmdev.h | |
| parent | dce32c781b1c026863a254fe8123dd78c59ad984 (diff) | |
| parent | 3a867b36c3234673e61f883ebc11ad18f80a176f (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'include/linux/atmdev.h')
| -rw-r--r-- | include/linux/atmdev.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/atmdev.h b/include/linux/atmdev.h index 9f374cfa1b05..f1fd849e5535 100644 --- a/include/linux/atmdev.h +++ b/include/linux/atmdev.h | |||
| @@ -457,7 +457,7 @@ static inline void atm_dev_put(struct atm_dev *dev) | |||
| 457 | 457 | ||
| 458 | int atm_charge(struct atm_vcc *vcc,int truesize); | 458 | int atm_charge(struct atm_vcc *vcc,int truesize); |
| 459 | struct sk_buff *atm_alloc_charge(struct atm_vcc *vcc,int pdu_size, | 459 | struct sk_buff *atm_alloc_charge(struct atm_vcc *vcc,int pdu_size, |
| 460 | int gfp_flags); | 460 | unsigned int __nocast gfp_flags); |
| 461 | int atm_pcr_goal(struct atm_trafprm *tp); | 461 | int atm_pcr_goal(struct atm_trafprm *tp); |
| 462 | 462 | ||
| 463 | void vcc_release_async(struct atm_vcc *vcc, int reply); | 463 | void vcc_release_async(struct atm_vcc *vcc, int reply); |