i2c-i801: Include <linux/slab.h> (fixes FTBFS on alpha)

svn path=/dists/trunk/linux-2.6/; revision=16741
This commit is contained in:
Ben Hutchings 2010-12-28 04:21:28 +00:00
parent 3d20b3f525
commit 503d455dea
3 changed files with 39 additions and 0 deletions

6
debian/changelog vendored
View File

@ -1,3 +1,9 @@
linux-2.6 (2.6.37~rc7-1~experimental.2) UNRELEASED; urgency=low
* i2c-i801: Include <linux/slab.h> (fixes FTBFS on alpha)
-- Ben Hutchings <ben@decadent.org.uk> Tue, 28 Dec 2010 03:15:05 +0000
linux-2.6 (2.6.37~rc7-1~experimental.1) experimental; urgency=low
* New upstream release candidate

View File

@ -0,0 +1,32 @@
From: Ben Hutchings <ben@decadent.org.uk>
Date: Mon, 13 Dec 2010 11:39:18 +1100
Subject: [PATCH] i2c-i801: Include <linux/slab.h>
commit 830e49925da933a9d9e4b0f86077066a368b47a1 upstream.
Commit 5a0e3ad6af8660be21ca98a971cd00f331318c05 added direct inclusion
of <linux/slab.h> to those source files that appeared to need it, but
somehow missed this. On most architectures <linux/slab.h> is still
indirectly included, but there are exceptions such as alpha.
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
---
drivers/i2c/busses/i2c-i801.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/drivers/i2c/busses/i2c-i801.c b/drivers/i2c/busses/i2c-i801.c
index 02835ce..7979aef 100644
--- a/drivers/i2c/busses/i2c-i801.c
+++ b/drivers/i2c/busses/i2c-i801.c
@@ -72,6 +72,7 @@
#include <linux/acpi.h>
#include <linux/io.h>
#include <linux/dmi.h>
+#include <linux/slab.h>
/* I801 SMBus address offsets */
#define SMBHSTSTS(p) (0 + (p)->smba)
--
1.7.2.3

View File

@ -0,0 +1 @@
+ bugfix/all/i2c-i801-Include-linux-slab.h.patch