aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/dvb/ttusb-dec/ttusb_dec.c
diff options
context:
space:
mode:
authorChristoph Lameter <clameter@sgi.com>2006-12-06 23:33:16 -0500
committerLinus Torvalds <torvalds@woody.osdl.org>2006-12-07 11:39:24 -0500
commit54e6ecb23951b195d02433a741c7f7cb0b796c78 (patch)
treec8885c49f37c8d383945b8af69d51597494ed62c /drivers/media/dvb/ttusb-dec/ttusb_dec.c
parentf7267c0c0721fd02ad3dc37c3d6dd24ccd81d4d6 (diff)
[PATCH] slab: remove SLAB_ATOMIC
SLAB_ATOMIC is an alias of GFP_ATOMIC Signed-off-by: Christoph Lameter <clameter@sgi.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/media/dvb/ttusb-dec/ttusb_dec.c')
-rw-r--r--drivers/media/dvb/ttusb-dec/ttusb_dec.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/dvb/ttusb-dec/ttusb_dec.c b/drivers/media/dvb/ttusb-dec/ttusb_dec.c
index 8135f3e76ae..10b121ada83 100644
--- a/drivers/media/dvb/ttusb-dec/ttusb_dec.c
+++ b/drivers/media/dvb/ttusb-dec/ttusb_dec.c
@@ -1244,7 +1244,7 @@ static int ttusb_dec_init_usb(struct ttusb_dec *dec)
1244 return -ENOMEM; 1244 return -ENOMEM;
1245 } 1245 }
1246 dec->irq_buffer = usb_buffer_alloc(dec->udev,IRQ_PACKET_SIZE, 1246 dec->irq_buffer = usb_buffer_alloc(dec->udev,IRQ_PACKET_SIZE,
1247 SLAB_ATOMIC, &dec->irq_dma_handle); 1247 GFP_ATOMIC, &dec->irq_dma_handle);
1248 if(!dec->irq_buffer) { 1248 if(!dec->irq_buffer) {
1249 return -ENOMEM; 1249 return -ENOMEM;
1250 } 1250 }