[PATCH-stable] Make 2.6.24.y headers_install work again

[PATCH-stable] Make 2.6.24.y headers_install work again

[Deepak Saxena]

This reverts commit 5fb7ba76544d95bfa05199f7394a442de5660be7.

>git-checkout v2.6.24.3
HEAD is now at 927684b... Linux 2.6.24.3
> make ARCH=arm INSTALL_HDR_PATH=/tmp headers_install
  CHK     include/linux/version.h
  UPD     include/linux/version.h
  HOSTCC  scripts/basic/fixdep
....
  UNIFDEF include/linux/icmp.h
  UNIFDEF include/linux/icmpv6.h
  UNIFDEF include/linux/if_addr.h
make[2]: *** No rule to make target
`/home/dsaxena/src/mvista/mvista-git/include/linux/if_addrlabel.h', needed
by `/tmp/include/linux/if_addrlabel.h'.  Stop.
make[1]: *** [linux] Error 2
make: *** [headers_install] Error 2

Commit 5fb7ba76544d95bfa05199f7394a442de5660be7 in the 2.6.24.y git tree
adds if_addrlabel.h to the sanitized headers, but since this header was 
not merged into the kernel until 2.6.25-rc1, the change is not needed.

Signed-off-by: Deepak Saxena <dsaxena@mvista.com>

---
 include/linux/Kbuild |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/include/linux/Kbuild b/include/linux/Kbuild
index 4b32bb1..f30fa92 100644
--- a/include/linux/Kbuild
+++ b/include/linux/Kbuild
@@ -217,7 +217,6 @@ unifdef-y += i2o-dev.h
 unifdef-y += icmp.h
 unifdef-y += icmpv6.h
 unifdef-y += if_addr.h
-unifdef-y += if_addrlabel.h
 unifdef-y += if_arp.h
 unifdef-y += if_bridge.h
 unifdef-y += if_ec.h
-- 
1.5.4.3.24.gabaa.dirty


-- 
   _____   __o  Deepak Saxena - Living CarFree and CareFree            (o>
------    -\<,  Towards Carfree Cities 2008 - www.carfreeportland.org  //\
 ----- ( )/ ( ) Linux Plumber's Conference - www.linuxplumbersconf.org V_/_
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Re: [stable] [PATCH-stable] Make 2.6.24.y headers_install work again

[Chris Wright]

* Deepak Saxena (dsaxena@plexity.net) wrote:
> 
> This reverts commit 5fb7ba76544d95bfa05199f7394a442de5660be7.

Thanks, it's queued up already.

http://git.kernel.org/?p=linux/kernel/git/stable/stable-queue.git;a=blob_plain;f=queue-2.6.24/revert-net-add-if_addrlabel.h-to-sanitized-headers.patch;h=2b713e6ef3731300a5b62c91ac7bd78993d41bcc

-chris