diff --git a/debian/changelog b/debian/changelog index ada64257a..344332389 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,12 @@ linux-2.6 (2.6.39~rc5-1~experimental.2) experimental; urgency=low + [ maximilian attems ] * Enable SQUASHFS_{LZO,XZ}. (closes: #613658) * [x86] Enable EASYCAP. (closes: #624505) + [ Ben Hutchings + * xhci-hcd: Include in xhci-pci.c (fixes FTBFS on armel) + -- maximilian attems Tue, 01 May 2011 14:36:33 +0100 linux-2.6 (2.6.39~rc5-1~experimental.1) experimental; urgency=low diff --git a/debian/patches/bugfix/all/xhci-hcd-Include-linux-slab.h-in-xhci-pci.c.patch b/debian/patches/bugfix/all/xhci-hcd-Include-linux-slab.h-in-xhci-pci.c.patch new file mode 100644 index 000000000..fdcc7717e --- /dev/null +++ b/debian/patches/bugfix/all/xhci-hcd-Include-linux-slab.h-in-xhci-pci.c.patch @@ -0,0 +1,29 @@ +Subject: [PATCH] xhci-hcd: Include in xhci-pci.c +From: Ben Hutchings +Date: Mon, 25 Apr 2011 16:54:28 +0100 + +Commit b02d0ed677acb3465e7600366f2353413bf24074 ('xhci: Change +hcd_priv into a pointer') added calls to kzalloc() and kfree() in +xhci-pci.c. On most architectures is indirectly +included, but on some it is not. + +Signed-off-by: Ben Hutchings +--- + drivers/usb/host/xhci-pci.c | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) + +diff --git a/drivers/usb/host/xhci-pci.c b/drivers/usb/host/xhci-pci.c +index a10494c..cbc4d49 100644 +--- a/drivers/usb/host/xhci-pci.c ++++ b/drivers/usb/host/xhci-pci.c +@@ -21,6 +21,7 @@ + */ + + #include ++#include + + #include "xhci.h" + +-- +1.7.4.4 + diff --git a/debian/patches/series/1~experimental.2 b/debian/patches/series/1~experimental.2 new file mode 100644 index 000000000..04df9cd3f --- /dev/null +++ b/debian/patches/series/1~experimental.2 @@ -0,0 +1 @@ ++ bugfix/all/xhci-hcd-Include-linux-slab.h-in-xhci-pci.c.patch