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

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

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

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

diff --git a/drivers/input/touchscreen/ads7846.c b/drivers/input/touchscreen/ads7846.c
index a47c95eef66..18e85a3441f 100644
--- a/drivers/input/touchscreen/ads7846.c
+++ b/drivers/input/touchscreen/ads7846.c
@@ -201,7 +201,7 @@ static int ads7846_read12_ser(struct device *dev, unsigned command)
 {
 	struct spi_device	*spi = to_spi_device(dev);
 	struct ads7846		*ts = dev_get_drvdata(dev);
-	struct ser_req		*req = kzalloc(sizeof *req, SLAB_KERNEL);
+	struct ser_req		*req = kzalloc(sizeof *req, GFP_KERNEL);
 	int			status;
 	int			sample;
 	int			use_internal;