From 39e5e77a1a4a18c559f8b10d848e6e4185c33c44 Mon Sep 17 00:00:00 2001
From: Jan Kiszka <jan.kiszka@web.de>
Date: Mon, 8 Feb 2010 10:12:20 +0000
Subject: [PATCH] --- yaml --- r: 184223 b: refs/heads/master c:
 54f0fad3d8414cf770c1cf25a1d98fcaec899b5a h: refs/heads/master i:   184221:
 cdc73fb4714482cfdd9f687cc6346ada717b3240   184219:
 7233d1f5b11d59a2417bf8d2888fbc3e2b15377d   184215:
 f0c912cfec35e978d4d68ea805d2ba952b817e46   184207:
 3ef01d7500814374e85547726b138ac178110949   184191:
 755627a9b939b9e5eb59202a32b1ff4f5cfd4c67 v: v3

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

diff --git a/[refs] b/[refs]
index f1f2451f9888..58e3becf0298 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 05b4149433ffae789edaf569da8d998c93eed1aa
+refs/heads/master: 54f0fad3d8414cf770c1cf25a1d98fcaec899b5a
diff --git a/trunk/drivers/isdn/capi/capi.c b/trunk/drivers/isdn/capi/capi.c
index 403bf8fcb285..f8f86602c57e 100644
--- a/trunk/drivers/isdn/capi/capi.c
+++ b/trunk/drivers/isdn/capi/capi.c
@@ -217,7 +217,7 @@ static struct capiminor *capiminor_alloc(struct capi20_appl *ap, u32 ncci)
 	unsigned int minor = 0;
 	unsigned long flags;
 
-	mp = kzalloc(sizeof(*mp), GFP_ATOMIC);
+	mp = kzalloc(sizeof(*mp), GFP_KERNEL);
   	if (!mp) {
   		printk(KERN_ERR "capi: can't alloc capiminor\n");
 		return NULL;
@@ -358,7 +358,7 @@ static struct capincci *capincci_alloc(struct capidev *cdev, u32 ncci)
 {
 	struct capincci *np, **pp;
 
-	np = kzalloc(sizeof(*np), GFP_ATOMIC);
+	np = kzalloc(sizeof(*np), GFP_KERNEL);
 	if (!np)
 		return NULL;
 	np->ncci = ncci;