From 2942a4253f5b79c132424a7d95a9cb61ad41c6d0 Mon Sep 17 00:00:00 2001
From: Julia Lawall <julia@diku.dk>
Date: Tue, 1 Jun 2010 00:26:06 -0700
Subject: [PATCH] --- yaml --- r: 199479 b: refs/heads/master c:
 b42d9165e1e3d92e4e3318642463dbe592a12568 h: refs/heads/master i:   199477:
 1672d7da0d865128dcede5eaced9eab4794f8bb5   199475:
 eb50a1da3ed361d70446618d90208e6f99d7a310   199471:
 5e4ab017d7845c6594c129fa857a0885a3e78092 v: v3

---
 [refs]                                     | 2 +-
 trunk/drivers/isdn/hardware/mISDN/netjet.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 7709c82d5dd8..44f07ad2d0e8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 96ed741e15896eea43f7203523db88bc8105c359
+refs/heads/master: b42d9165e1e3d92e4e3318642463dbe592a12568
diff --git a/trunk/drivers/isdn/hardware/mISDN/netjet.c b/trunk/drivers/isdn/hardware/mISDN/netjet.c
index 0a3553df065f..54ae71a907f9 100644
--- a/trunk/drivers/isdn/hardware/mISDN/netjet.c
+++ b/trunk/drivers/isdn/hardware/mISDN/netjet.c
@@ -320,12 +320,12 @@ inittiger(struct tiger_hw *card)
 		return -ENOMEM;
 	}
 	for (i = 0; i < 2; i++) {
-		card->bc[i].hsbuf = kmalloc(NJ_DMA_TXSIZE, GFP_KERNEL);
+		card->bc[i].hsbuf = kmalloc(NJ_DMA_TXSIZE, GFP_ATOMIC);
 		if (!card->bc[i].hsbuf) {
 			pr_info("%s: no B%d send buffer\n", card->name, i + 1);
 			return -ENOMEM;
 		}
-		card->bc[i].hrbuf = kmalloc(NJ_DMA_RXSIZE, GFP_KERNEL);
+		card->bc[i].hrbuf = kmalloc(NJ_DMA_RXSIZE, GFP_ATOMIC);
 		if (!card->bc[i].hrbuf) {
 			pr_info("%s: no B%d recv buffer\n", card->name, i + 1);
 			return -ENOMEM;