[kernel] r4890 - dists/trunk/linux-2.6/debian/arch/powerpc

[Sven Luther]

Author: luther
Date: Thu Nov 24 17:15:06 2005
New Revision: 4890

Modified:
   dists/trunk/linux-2.6/debian/arch/powerpc/config
   dists/trunk/linux-2.6/debian/arch/powerpc/config.powerpc-miboot
   dists/trunk/linux-2.6/debian/arch/powerpc/defines
Log:
More powerpc config changes.
Adapted defines to new kernel-package.


Modified: dists/trunk/linux-2.6/debian/arch/powerpc/config
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/powerpc/config	(original)
+++ dists/trunk/linux-2.6/debian/arch/powerpc/config	Thu Nov 24 17:15:06 2005
@@ -1254,3 +1254,12 @@
 CONFIG_HOTPLUG=y
 # CONFIG_HOTPLUG_CPU is not set
 CONFIG_I2C_PMAC_SMU=m
+CONFIG_PPC_INDIRECT_PCI=y
+CONFIG_PM_LEGACY=y
+CONFIG_PPC_I8259=y
+CONFIG_WINDFARM=m
+CONFIG_FLATMEM_MANUAL=y
+CONFIG_FB_NVIDIA_I2C=y
+# CONFIG_SPARSEMEM_MANUAL is not set
+# CONFIG_DISCONTIGMEM_MANUAL is not set
+CONFIG_SPLIT_PTLOCK_CPUS=4

Modified: dists/trunk/linux-2.6/debian/arch/powerpc/config.powerpc-miboot
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/powerpc/config.powerpc-miboot	(original)
+++ dists/trunk/linux-2.6/debian/arch/powerpc/config.powerpc-miboot	Thu Nov 24 17:15:06 2005
@@ -73,3 +73,4 @@
 CONFIG_CRYPTO_MD5=y
 # CONFIG_SOFTWARE_SUSPEND is not set
 ONFIG_SOFTWARE_SUSPEND=m
+CONFIG_DEFAULT_DEADLINE=y

Modified: dists/trunk/linux-2.6/debian/arch/powerpc/defines
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/powerpc/defines	(original)
+++ dists/trunk/linux-2.6/debian/arch/powerpc/defines	Thu Nov 24 17:15:06 2005
@@ -4,11 +4,13 @@
  powerpc-smp
  powerpc-miboot
  powerpc64
-kernel-arch: ppc
 kernel-header-dirs: powerpc ppc ppc64 m68k
+kernel-arch: powerpc
 kpkg-subarch: powerpc
 
 [apus]
+kernel-arch: ppc
+kpkg-subarch: powerpc32
 depends: mkvmlinuz (>= 15)
 
 [powerpc]
@@ -16,7 +18,3 @@
 
 [powerpc-smp]
 depends: mkvmlinuz (>= 15)
-
-[powerpc64]
-kernel-arch: powerpc
-kpkg-subarch: powerpc64