From: Dirk Behme <dirk.behme_at_gmail.com>
Date: Fri, 22 Dec 2006 20:35:03 +0000 (-0800)
Subject: ARM: OMAP: Convert SLAB_KERNEL to GFP_KERNEL in omap_uwire.c
X-Git-Tag: v2.6.21-omap1~196
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=44734f47aea89a2f4dfe495319d0a38a8779e281;p=linux-2.6-omap-h63xx.git

ARM: OMAP: Convert SLAB_KERNEL to GFP_KERNEL in omap_uwire.c

ARM: OMAP: Convert SLAB_KERNEL to GFP_KERNEL in omap_uwire.c

Signed-off-by: Dirk Behme <dirk.behme_at_gmail.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
---

diff --git a/drivers/spi/omap_uwire.c b/drivers/spi/omap_uwire.c
index d3a421b9f31..b5a4d62c7c3 100644
--- a/drivers/spi/omap_uwire.c
+++ b/drivers/spi/omap_uwire.c
@@ -446,7 +446,7 @@ static int uwire_setup(struct spi_device *spi)
 	struct uwire_state *ust = spi->controller_state;
 
 	if (ust == NULL) {
-		ust = kzalloc(sizeof(*ust), SLAB_KERNEL);
+		ust = kzalloc(sizeof(*ust), GFP_KERNEL);
 		if (ust == NULL)
 			return -ENOMEM;
 		spi->controller_state = ust;