From 42681a39c415ce42e84df552ab9012ef49151995 Mon Sep 17 00:00:00 2001
From: Ben Hutchings <benh@debian.org>
Date: Sat, 29 Dec 2012 01:12:07 +0000
Subject: [PATCH] linux-headers-common: Include the include/uapi/asm-generic
 directory (Closes: #696664)

svn path=/dists/trunk/linux/; revision=19657
---
 debian/changelog  | 8 ++++++++
 debian/rules.real | 3 +--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9186eebdb..3da857b2f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+linux (3.7.1-1~experimental.2) UNRELEASED; urgency=low
+
+  [ Ben Hutchings ]
+  * linux-headers-common: Include the include/uapi/asm-generic directory
+    (Closes: #696664)
+
+ -- Ben Hutchings <ben@decadent.org.uk>  Sat, 29 Dec 2012 02:05:46 +0100
+
 linux (3.7.1-1~experimental.1) experimental; urgency=low
 
   * New upstream release: http://kernelnewbies.org/Linux_3.7
diff --git a/debian/rules.real b/debian/rules.real
index e2b4257f6..273df72b6 100644
--- a/debian/rules.real
+++ b/debian/rules.real
@@ -235,8 +235,7 @@ install-headers_$(ARCH)_$(FEATURESET): $(STAMPS_DIR)/source_$(FEATURESET)
 	  find arch/$(KERNEL_ARCH) -maxdepth 1 -name 'Makefile*' -print; \
 	  find arch/$(KERNEL_ARCH) -name 'module.lds' -print; \
 	  find $$(find arch/$(KERNEL_ARCH) \( -name include -o -name scripts \) -type d -print) -print; \
-	  find include -name 'asm*' -prune -o -print; \
-	  find include/asm-generic -print; \
+	  find include -print; \
 	) \
 	| \
 	cpio -pd --preserve-modification-time '$(CURDIR)/$(DIR)'