[kernel] r12011 - dists/trunk/linux-2.6/debian/patches/debian

[Bastian Blank]

Author: waldi
Date: Sun Aug 10 08:35:53 2008
New Revision: 12011

Log:
debian/patches/debian/kernelvariables.patch: Fix.


Modified:
   dists/trunk/linux-2.6/debian/patches/debian/kernelvariables.patch

Modified: dists/trunk/linux-2.6/debian/patches/debian/kernelvariables.patch
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/debian/kernelvariables.patch	(original)
+++ dists/trunk/linux-2.6/debian/patches/debian/kernelvariables.patch	Sun Aug 10 08:35:53 2008
@@ -4,7 +4,7 @@
 
 --- a/Makefile
 +++ b/Makefile
-@@ -193,18 +193,6 @@
+@@ -193,25 +193,6 @@
  ARCH		?= $(SUBARCH)
  CROSS_COMPILE	?=
  
@@ -20,10 +20,17 @@
 -        SRCARCH := x86
 -endif
 -
+-# Where to locate arch specific headers
+-ifeq ($(ARCH),sparc64)
+-       hdr-arch  := sparc
+-else
+-       hdr-arch  := $(SRCARCH)
+-endif
+-
  KCONFIG_CONFIG	?= .config
  
  # SHELL used by kbuild
-@@ -340,6 +326,20 @@
+@@ -340,6 +326,27 @@
  KERNELRELEASE = $(shell cat include/config/kernel.release 2> /dev/null)
  KERNELVERSION = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
  
@@ -41,6 +48,13 @@
 +        SRCARCH := x86
 +endif
 +
++# Where to locate arch specific headers
++ifeq ($(ARCH),sparc64)
++	hdr-arch  := sparc
++else
++	hdr-arch  := $(SRCARCH)
++endif
++
  export VERSION PATCHLEVEL SUBLEVEL KERNELRELEASE KERNELVERSION
  export ARCH SRCARCH CONFIG_SHELL HOSTCC HOSTCFLAGS CROSS_COMPILE AS LD CC
  export CPP AR NM STRIP OBJCOPY OBJDUMP MAKE AWK GENKSYMS PERL UTS_MACHINE