diff --git a/debian/changelog b/debian/changelog index 1e006b609..9c2bf1b51 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +linux-2.6 (2.6.37~rc7-1~experimental.2) UNRELEASED; urgency=low + + * i2c-i801: Include (fixes FTBFS on alpha) + + -- Ben Hutchings 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 diff --git a/debian/patches/bugfix/all/i2c-i801-Include-linux-slab.h.patch b/debian/patches/bugfix/all/i2c-i801-Include-linux-slab.h.patch new file mode 100644 index 000000000..69ef12271 --- /dev/null +++ b/debian/patches/bugfix/all/i2c-i801-Include-linux-slab.h.patch @@ -0,0 +1,32 @@ +From: Ben Hutchings +Date: Mon, 13 Dec 2010 11:39:18 +1100 +Subject: [PATCH] i2c-i801: Include + +commit 830e49925da933a9d9e4b0f86077066a368b47a1 upstream. + +Commit 5a0e3ad6af8660be21ca98a971cd00f331318c05 added direct inclusion +of to those source files that appeared to need it, but +somehow missed this. On most architectures is still +indirectly included, but there are exceptions such as alpha. + +Signed-off-by: Ben Hutchings +Signed-off-by: Jean Delvare +--- + 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 + #include + #include ++#include + + /* I801 SMBus address offsets */ + #define SMBHSTSTS(p) (0 + (p)->smba) +-- +1.7.2.3 + diff --git a/debian/patches/series/1~experimental.2 b/debian/patches/series/1~experimental.2 new file mode 100644 index 000000000..4acfb0398 --- /dev/null +++ b/debian/patches/series/1~experimental.2 @@ -0,0 +1 @@ ++ bugfix/all/i2c-i801-Include-linux-slab.h.patch