[<prev] [next>] [day] [month] [year] [list]
Message-Id: <20100329164748.e1e16358.sfr@canb.auug.org.au>
Date: Mon, 29 Mar 2010 16:47:48 +1100
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Tejun Heo <tj@...nel.org>
Cc: linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
Bryan Wu <cooloney@...nel.org>,
Dmitry Torokhov <dmitry.torokhov@...il.com>
Subject: linux-next: build failure after merge of the slabh tree
Hi Tejun,
After merging the slabh tree, today's linux-next build (x86_64
allmodconfig) failed like this:
drivers/input/misc/pcf8574_keypad.c: In function 'pcf8574_kp_probe':
drivers/input/misc/pcf8574_keypad.c:95: error: implicit declaration of function 'kzalloc'
drivers/input/misc/pcf8574_keypad.c:95: warning: assignment makes pointer from integer without a cast
drivers/input/misc/pcf8574_keypad.c:156: error: implicit declaration of function 'kfree'
Caused by commit d103d3b3e8512312b5254950035366d4422a479a ("percpu: don't
implicitly include slab.h from percpu.h") from the slabh tree interacting
with commit 88643169de358b8e5af101151d913ad80e4c64df ("Input: add PCF8574
I2C keypad input device driver") from the input tree.
I applied the following merge fixup patch which should be applied to the
input tree (see Documentation/SubmitChecklist Rule #1 :-)).
From: Stephen Rothwell <sfr@...b.auug.org.au>
Date: Mon, 29 Mar 2010 16:45:42 +1100
Subject: [PATCH] input: pcf8574_keypad: use of kzalloc/kfree requires the include of slab.h
Signed-off-by: Stephen Rothwell <sfr@...b.auug.org.au>
---
drivers/input/misc/pcf8574_keypad.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/drivers/input/misc/pcf8574_keypad.c b/drivers/input/misc/pcf8574_keypad.c
index cb135e5..5c3ac4e 100644
--- a/drivers/input/misc/pcf8574_keypad.c
+++ b/drivers/input/misc/pcf8574_keypad.c
@@ -11,6 +11,7 @@
#include <linux/input.h>
#include <linux/interrupt.h>
#include <linux/i2c.h>
+#include <linux/slab.h>
#include <linux/workqueue.h>
#define DRV_NAME "pcf8574_keypad"
--
1.7.0.3
--
Cheers,
Stephen Rothwell sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists