diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-18 21:23:11 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-18 21:23:11 -0400 |
| commit | 4e0e329d9a2011f9f7a7c0a378dc3bff7b0a0283 (patch) | |
| tree | a802614e01460631c694dfa118642d54c3d5fc79 /drivers/atm/fore200e.c | |
| parent | e33b9dfa3008fcaa908dc0c8c472a812c400f839 (diff) | |
| parent | 59a10b172fccaea793352c00fd9065f0a5b4ef70 (diff) | |
Merge branch 'upstream'
Diffstat (limited to 'drivers/atm/fore200e.c')
| -rw-r--r-- | drivers/atm/fore200e.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/atm/fore200e.c b/drivers/atm/fore200e.c index 6f1a83c9d9e0..14f6a6201da3 100644 --- a/drivers/atm/fore200e.c +++ b/drivers/atm/fore200e.c | |||
| @@ -178,7 +178,7 @@ fore200e_irq_itoa(int irq) | |||
| 178 | 178 | ||
| 179 | 179 | ||
| 180 | static void* | 180 | static void* |
| 181 | fore200e_kmalloc(int size, unsigned int __nocast flags) | 181 | fore200e_kmalloc(int size, gfp_t flags) |
| 182 | { | 182 | { |
| 183 | void *chunk = kzalloc(size, flags); | 183 | void *chunk = kzalloc(size, flags); |
| 184 | 184 | ||