diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-09 11:16:14 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-09 11:16:14 -0400 |
| commit | c4052da6f0c01a0b059d125d72bb934d0980b798 (patch) | |
| tree | ad50a17e4d14b8f6f1773158d956d424575d1712 /include/linux/atmdev.h | |
| parent | cedc9a478d8c6265879dc3839ef3d4849a709184 (diff) | |
| parent | 3d3467f0fdf61a421361c00cf84fcf0f1a6dc1e8 (diff) | |
Merge branch 'upstream'
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) int atm_charge(struct atm_vcc *vcc,int truesize); struct sk_buff *atm_alloc_charge(struct atm_vcc *vcc,int pdu_size, - int gfp_flags); + unsigned int __nocast gfp_flags); int atm_pcr_goal(struct atm_trafprm *tp); void vcc_release_async(struct atm_vcc *vcc, int reply); |