Merge samba.org:/scratch/anton/sfr

into samba.org:/scratch/anton/linux-2.5_ppc64

arch/ppc64/kernel/htab.c

@@ -18,7 +18,6 @@
  * 2 of the License, or (at your option) any later version.
  */
 
-#include <linux/config.h>
 #include <linux/spinlock.h>
 #include <linux/errno.h>
 #include <linux/sched.h>

arch/ppc64/kernel/pci_dma.c

@@ -21,6 +21,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  */
 
+#include <linux/config.h>
 #include <linux/init.h>
 #include <linux/types.h>
 #include <linux/slab.h>

arch/ppc64/kernel/rtc.c

@@ -21,6 +21,7 @@
 
 #define RTC_VERSION		"1.1"
 
+#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/types.h>

arch/ppc64/kernel/sys_ppc32.c

@@ -15,7 +15,6 @@
  */
 
 #include <asm/ptrace.h>
-#include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/sched.h>
 #include <linux/fs.h> 

arch/ppc64/mm/extable.c

@@ -9,7 +9,6 @@
  *      2 of the License, or (at your option) any later version.
  */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/init.h>
 #include <asm/uaccess.h>

include/asm-ppc64/topology.h

 #ifndef _ASM_PPC64_TOPOLOGY_H
 #define _ASM_PPC64_TOPOLOGY_H
 
+#include <linux/config.h>
 #include <asm/mmzone.h>
 
 #ifdef CONFIG_NUMA