r3690 - in people/waldi/kernel/source/linux-2.6/debian: . arch/powerpc

[Bastian Blank]

Author: waldi
Date: 2005-08-05 16:14:32 +0000 (Fri, 05 Aug 2005)
New Revision: 3690

Modified:
   people/waldi/kernel/source/linux-2.6/debian/
   people/waldi/kernel/source/linux-2.6/debian/arch/powerpc/Makefile.inc
Log:
Merge /trunk/kernel/source/linux-2.6.



Property changes on: people/waldi/kernel/source/linux-2.6/debian
___________________________________________________________________
Name: svk:merge
   - 510b9475-24dd-0310-9b6c-e0eefe99d49f:/trunk/kernel/source/linux-2.6/debian:3676
   + 510b9475-24dd-0310-9b6c-e0eefe99d49f:/trunk/kernel/source/linux-2.6/debian:3688

Modified: people/waldi/kernel/source/linux-2.6/debian/arch/powerpc/Makefile.inc
===================================================================
--- people/waldi/kernel/source/linux-2.6/debian/arch/powerpc/Makefile.inc	2005-08-05 15:36:24 UTC (rev 3689)
+++ people/waldi/kernel/source/linux-2.6/debian/arch/powerpc/Makefile.inc	2005-08-05 16:14:32 UTC (rev 3690)
@@ -1,6 +1,6 @@
 #
 # Variables 
 #
-header_dirs = 'ppc | ppc64'
+headers_dirs = 'ppc | ppc64'
 headers_subarch = powerpc
 build_subarch = powerpc