split-config
Hi,
I noticed two potential problems while trying to manipulate
the kernel configs to consistently turn USB_BANDWIDTH on or off.
1) split-config does not seem to work with architecures such as
amd64 and powerpc where the architecture name the kernel
uses differes from the name that debian uses.
Is the best way to resolve this by adding a simple
mapping in split-config?
2) Running splitconfig for 386, seems to need to be run
multiple times to stablilise the config, even if
no options are changed. The attached patch reflects
the config changes effected by the following sequence of events
run on the current dists/trunk/linux-2.6 and 2.6.13 from kernel.org
Note that the patch disables CONFIG_FB_VESA for amd64 as
a side effect of the opperations below. I tried to rectify
this using split-config and arrived at problem 1 above.
# ~/blah/scripts/split-config debian/arch/ 386
make[2]: warning: -jN forced in submake: disabling jobserver mode.
scripts/kconfig/mconf arch/i386/Kconfig
#
# using defaults found in .config
#
.config:56: trying to assign nonexistent symbol GAMEPORT_VORTEX
.config:93: trying to assign nonexistent symbol DEVFS_DEBUG
.config:138: trying to assign nonexistent symbol DEVFS_FS
.config:214: trying to assign nonexistent symbol SND_VXP440
.config:233: trying to assign nonexistent symbol SCSI_PCI2220I
.config:251: trying to assign nonexistent symbol DVB_DIBCOM_DEBUG
.config:328: trying to assign nonexistent symbol DVB_DIBUSB
.config:383: trying to assign nonexistent symbol MTD_ELAN_104NC
.config:467: trying to assign nonexistent symbol SERIAL_8250_MULTIPORT
.config:895: trying to assign nonexistent symbol DVB_DIBUSB_MISDESIGNED_DEVICES
.config:1028: trying to assign nonexistent symbol DEVFS_MOUNT
.config:1069: trying to assign nonexistent symbol JFFS2_FS_NAND
.config:1169: trying to assign nonexistent symbol SCSI_PCI2000
.config:1217: trying to assign nonexistent symbol DVB_B2C2_SKYSTAR
.config:1413: trying to assign nonexistent symbol GAMEPORT_CS461X
.config:2136: trying to assign nonexistent symbol JFFS2_FS_NOR_ECC
[ nothing modified in menuconfig ]
*** End of Linux kernel configuration.
*** Execute 'make' to build the kernel or try 'make help'.
CONFIG_HZ_250=y has been added.
Do you want to make this change [G]lobal, per-[A]rch, or per-[F]lavour?
[GAF] G
CONFIG_HZ_100=n has been added.
Do you want to make this change [G]lobal, per-[A]rch, or per-[F]lavour?
[GAF] G
CONFIG_FLATMEM_MANUAL=y has been added.
Do you want to make this change [G]lobal, per-[A]rch, or per-[F]lavour?
[GAF] G
CONFIG_PHYSICAL_START=0x100000 has been added.
Do you want to make this change [G]lobal, per-[A]rch, or per-[F]lavour?
[GAF] G
CONFIG_MTD_PCMCIA_ANONYMOUS=n has been added.
Do you want to make this change [G]lobal, per-[A]rch, or per-[F]lavour?
[GAF] G
CONFIG_SERIAL_8250_MCA=n has been added.
Do you want to make this change [G]lobal, per-[A]rch, or per-[F]lavour?
[GAF] G
CONFIG_SELECT_MEMORY_MODEL=y has been added.
Do you want to make this change [G]lobal, per-[A]rch, or per-[F]lavour?
[GAF] G
CONFIG_SPARSEMEM_MANUAL=n has been added.
Do you want to make this change [G]lobal, per-[A]rch, or per-[F]lavour?
[GAF] G
CONFIG_KEXEC=n has been added.
Do you want to make this change [G]lobal, per-[A]rch, or per-[F]lavour?
[GAF] G
CONFIG_FLAT_NODE_MEM_MAP=y has been added.
Do you want to make this change [G]lobal, per-[A]rch, or per-[F]lavour?
[GAF] G
CONFIG_FLATMEM=y has been added.
Do you want to make this change [G]lobal, per-[A]rch, or per-[F]lavour?
[GAF] G
CONFIG_ACPI_HOTKEY=n has been added.
Do you want to make this change [G]lobal, per-[A]rch, or per-[F]lavour?
[GAF] G
CONFIG_SCSI_QLA2XXX=m has been added.
Do you want to make this change [G]lobal, per-[A]rch, or per-[F]lavour?
[GAF] G
CONFIG_DISCONTIGMEM_MANUAL=n has been added.
Do you want to make this change [G]lobal, per-[A]rch, or per-[F]lavour?
[GAF] G
CONFIG_ACPI_SLEEP_PROC_SLEEP=n has been added.
Do you want to make this change [G]lobal, per-[A]rch, or per-[F]lavour?
[GAF] G
CONFIG_JFFS2_FS_WRITEBUFFER=y has been added.
Do you want to make this change [G]lobal, per-[A]rch, or per-[F]lavour?
[GAF] G
CONFIG_EXT2_FS_XIP=n has been added.
Do you want to make this change [G]lobal, per-[A]rch, or per-[F]lavour?
[GAF] G
CONFIG_HZ_1000=n has been added.
Do you want to make this change [G]lobal, per-[A]rch, or per-[F]lavour?
[GAF] G
CONFIG_HZ=250 has been added.
Do you want to make this change [G]lobal, per-[A]rch, or per-[F]lavour?
[GAF] G
CONFIG_I2O_CONFIG_OLD_IOCTL=y has been added.
Do you want to make this change [G]lobal, per-[A]rch, or per-[F]lavour?
[GAF] G
CONFIG_FUSION has been changed from 'm' to 'y'.
Do you want to make this change [G]lobal, per-[A]rch, or per-[F]lavour?
[GAF] G
# ~/blah/scripts/split-config debian/arch/ 386
make[2]: warning: -jN forced in submake: disabling jobserver mode.
scripts/kconfig/mconf arch/i386/Kconfig
#
# using defaults found in .config
#
.config:56: trying to assign nonexistent symbol GAMEPORT_VORTEX
.config:93: trying to assign nonexistent symbol DEVFS_DEBUG
.config:138: trying to assign nonexistent symbol DEVFS_FS
.config:215: trying to assign nonexistent symbol SND_VXP440
.config:234: trying to assign nonexistent symbol SCSI_PCI2220I
.config:252: trying to assign nonexistent symbol DVB_DIBCOM_DEBUG
.config:329: trying to assign nonexistent symbol DVB_DIBUSB
.config:385: trying to assign nonexistent symbol MTD_ELAN_104NC
.config:468: trying to assign nonexistent symbol SERIAL_8250_MULTIPORT
.config:900: trying to assign nonexistent symbol DVB_DIBUSB_MISDESIGNED_DEVICES
.config:1034: trying to assign nonexistent symbol DEVFS_MOUNT
.config:1075: trying to assign nonexistent symbol JFFS2_FS_NAND
.config:1177: trying to assign nonexistent symbol SCSI_PCI2000
.config:1225: trying to assign nonexistent symbol DVB_B2C2_SKYSTAR
.config:1422: trying to assign nonexistent symbol GAMEPORT_CS461X
.config:2153: trying to assign nonexistent symbol JFFS2_FS_NOR_ECC
[ enabled FB_VESA in menuconfig ]
*** End of Linux kernel configuration.
*** Execute 'make' to build the kernel or try 'make help'.
CONFIG_FB_CFB_IMAGEBLIT has been changed from 'm' to 'y'.
Do you want to make this change [G]lobal, per-[A]rch, or per-[F]lavour?
[GAF] G
# ~/blah/scripts/split-config debian/arch/ 386
make[2]: warning: -jN forced in submake: disabling jobserver mode.
scripts/kconfig/mconf arch/i386/Kconfig
#
# using defaults found in .config
#
.config:56: trying to assign nonexistent symbol GAMEPORT_VORTEX
.config:93: trying to assign nonexistent symbol DEVFS_DEBUG
.config:138: trying to assign nonexistent symbol DEVFS_FS
.config:215: trying to assign nonexistent symbol SND_VXP440
.config:234: trying to assign nonexistent symbol SCSI_PCI2220I
.config:252: trying to assign nonexistent symbol DVB_DIBCOM_DEBUG
.config:329: trying to assign nonexistent symbol DVB_DIBUSB
.config:385: trying to assign nonexistent symbol MTD_ELAN_104NC
.config:468: trying to assign nonexistent symbol SERIAL_8250_MULTIPORT
.config:900: trying to assign nonexistent symbol DVB_DIBUSB_MISDESIGNED_DEVICES
.config:1034: trying to assign nonexistent symbol DEVFS_MOUNT
.config:1075: trying to assign nonexistent symbol JFFS2_FS_NAND
.config:1177: trying to assign nonexistent symbol SCSI_PCI2000
.config:1225: trying to assign nonexistent symbol DVB_B2C2_SKYSTAR
.config:1422: trying to assign nonexistent symbol GAMEPORT_CS461X
.config:2153: trying to assign nonexistent symbol JFFS2_FS_NOR_ECC
[ enabled FB_VESA in menuconfig ]
*** End of Linux kernel configuration.
*** Execute 'make' to build the kernel or try 'make help'.
CONFIG_FB_SOFT_CURSOR has been changed from 'm' to 'y'.
Do you want to make this change [G]lobal, per-[A]rch, or per-[F]lavour?
[GAF] G
# ~/blah/scripts/split-config debian/arch/ 386
make[2]: warning: -jN forced in submake: disabling jobserver mode.
scripts/kconfig/mconf arch/i386/Kconfig
#
# using defaults found in .config
#
.config:56: trying to assign nonexistent symbol GAMEPORT_VORTEX
.config:93: trying to assign nonexistent symbol DEVFS_DEBUG
.config:138: trying to assign nonexistent symbol DEVFS_FS
.config:215: trying to assign nonexistent symbol SND_VXP440
.config:234: trying to assign nonexistent symbol SCSI_PCI2220I
.config:252: trying to assign nonexistent symbol DVB_DIBCOM_DEBUG
.config:329: trying to assign nonexistent symbol DVB_DIBUSB
.config:385: trying to assign nonexistent symbol MTD_ELAN_104NC
.config:468: trying to assign nonexistent symbol SERIAL_8250_MULTIPORT
.config:900: trying to assign nonexistent symbol DVB_DIBUSB_MISDESIGNED_DEVICES
.config:1034: trying to assign nonexistent symbol DEVFS_MOUNT
.config:1075: trying to assign nonexistent symbol JFFS2_FS_NAND
.config:1177: trying to assign nonexistent symbol SCSI_PCI2000
.config:1225: trying to assign nonexistent symbol DVB_B2C2_SKYSTAR
.config:1422: trying to assign nonexistent symbol GAMEPORT_CS461X
.config:2153: trying to assign nonexistent symbol JFFS2_FS_NOR_ECC
[ enabled FB_VESA in menuconfig ]
*** End of Linux kernel configuration.
*** Execute 'make' to build the kernel or try 'make help'.
CONFIG_FB_VESA has been changed from 'm' to 'y'.
Do you want to make this change [G]lobal, per-[A]rch, or per-[F]lavour?
[GAF] G
# ~/blah/scripts/split-config debian/arch/ 386
make[2]: warning: -jN forced in submake: disabling jobserver mode.
scripts/kconfig/mconf arch/i386/Kconfig
#
# using defaults found in .config
#
.config:56: trying to assign nonexistent symbol GAMEPORT_VORTEX
.config:93: trying to assign nonexistent symbol DEVFS_DEBUG
.config:138: trying to assign nonexistent symbol DEVFS_FS
.config:215: trying to assign nonexistent symbol SND_VXP440
.config:234: trying to assign nonexistent symbol SCSI_PCI2220I
.config:252: trying to assign nonexistent symbol DVB_DIBCOM_DEBUG
.config:329: trying to assign nonexistent symbol DVB_DIBUSB
.config:385: trying to assign nonexistent symbol MTD_ELAN_104NC
.config:468: trying to assign nonexistent symbol SERIAL_8250_MULTIPORT
.config:900: trying to assign nonexistent symbol DVB_DIBUSB_MISDESIGNED_DEVICES
.config:1034: trying to assign nonexistent symbol DEVFS_MOUNT
.config:1075: trying to assign nonexistent symbol JFFS2_FS_NAND
.config:1177: trying to assign nonexistent symbol SCSI_PCI2000
.config:1225: trying to assign nonexistent symbol DVB_B2C2_SKYSTAR
.config:1422: trying to assign nonexistent symbol GAMEPORT_CS461X
.config:2153: trying to assign nonexistent symbol JFFS2_FS_NOR_ECC
[ enabled FB_VESA in menuconfig ]
*** End of Linux kernel configuration.
*** Execute 'make' to build the kernel or try 'make help'.
CONFIG_FB_CFB_FILLRECT has been changed from 'm' to 'y'.
Do you want to make this change [G]lobal, per-[A]rch, or per-[F]lavour?
[GAF] G
# ~/blah/scripts/split-config debian/arch/ 386
make[2]: warning: -jN forced in submake: disabling jobserver mode.
scripts/kconfig/mconf arch/i386/Kconfig
#
# using defaults found in .config
#
.config:56: trying to assign nonexistent symbol GAMEPORT_VORTEX
.config:93: trying to assign nonexistent symbol DEVFS_DEBUG
.config:138: trying to assign nonexistent symbol DEVFS_FS
.config:215: trying to assign nonexistent symbol SND_VXP440
.config:234: trying to assign nonexistent symbol SCSI_PCI2220I
.config:252: trying to assign nonexistent symbol DVB_DIBCOM_DEBUG
.config:329: trying to assign nonexistent symbol DVB_DIBUSB
.config:385: trying to assign nonexistent symbol MTD_ELAN_104NC
.config:468: trying to assign nonexistent symbol SERIAL_8250_MULTIPORT
.config:900: trying to assign nonexistent symbol DVB_DIBUSB_MISDESIGNED_DEVICES
.config:1034: trying to assign nonexistent symbol DEVFS_MOUNT
.config:1075: trying to assign nonexistent symbol JFFS2_FS_NAND
.config:1177: trying to assign nonexistent symbol SCSI_PCI2000
.config:1225: trying to assign nonexistent symbol DVB_B2C2_SKYSTAR
.config:1422: trying to assign nonexistent symbol GAMEPORT_CS461X
.config:2153: trying to assign nonexistent symbol JFFS2_FS_NOR_ECC
[ enabled FB_VESA in menuconfig ]
*** End of Linux kernel configuration.
*** Execute 'make' to build the kernel or try 'make help'.
CONFIG_FB_CFB_COPYAREA has been changed from 'm' to 'y'.
Do you want to make this change [G]lobal, per-[A]rch, or per-[F]lavour?
[GAF] G
# ~/blah/scripts/split-config debian/arch/ 386
make[2]: warning: -jN forced in submake: disabling jobserver mode.
scripts/kconfig/mconf arch/i386/Kconfig
#
# using defaults found in .config
#
.config:56: trying to assign nonexistent symbol GAMEPORT_VORTEX
.config:93: trying to assign nonexistent symbol DEVFS_DEBUG
.config:138: trying to assign nonexistent symbol DEVFS_FS
.config:215: trying to assign nonexistent symbol SND_VXP440
.config:234: trying to assign nonexistent symbol SCSI_PCI2220I
.config:252: trying to assign nonexistent symbol DVB_DIBCOM_DEBUG
.config:329: trying to assign nonexistent symbol DVB_DIBUSB
.config:385: trying to assign nonexistent symbol MTD_ELAN_104NC
.config:468: trying to assign nonexistent symbol SERIAL_8250_MULTIPORT
.config:900: trying to assign nonexistent symbol DVB_DIBUSB_MISDESIGNED_DEVICES
.config:1034: trying to assign nonexistent symbol DEVFS_MOUNT
.config:1075: trying to assign nonexistent symbol JFFS2_FS_NAND
.config:1177: trying to assign nonexistent symbol SCSI_PCI2000
.config:1225: trying to assign nonexistent symbol DVB_B2C2_SKYSTAR
.config:1422: trying to assign nonexistent symbol GAMEPORT_CS461X
.config:2153: trying to assign nonexistent symbol JFFS2_FS_NOR_ECC
[ no change in menuconfig (FB_VESA is on) ]
*** End of Linux kernel configuration.
*** Execute 'make' to build the kernel or try 'make help'.
--
Horms
diff --exclude .svn -ruN /home/horms/work/debian-kernel/debian-2.6-experimental/debian/arch/alpha/config debian/arch/alpha/config
--- /home/horms/work/debian-kernel/debian-2.6-experimental/debian/arch/alpha/config 2005-09-15 11:30:56.000000000 +0900
+++ debian/arch/alpha/config 2005-09-15 12:37:00.000000000 +0900
@@ -329,7 +329,6 @@
CONFIG_MD_RAID6=m
CONFIG_MD_FAULTY=m
CONFIG_DM_MULTIPATH_EMC=m
-CONFIG_FUSION=m
CONFIG_FUSION_MAX_SGE=40
CONFIG_FUSION_CTL=m
CONFIG_FUSION_LAN=m
@@ -1226,10 +1225,6 @@
CONFIG_VIDEO_IR=m
CONFIG_VIDEO_TVEEPROM=m
CONFIG_FB=y
-CONFIG_FB_CFB_FILLRECT=m
-CONFIG_FB_CFB_COPYAREA=m
-CONFIG_FB_CFB_IMAGEBLIT=m
-CONFIG_FB_SOFT_CURSOR=m
# CONFIG_FB_MACMODES is not set
CONFIG_FB_MODE_HELPERS=y
CONFIG_FB_TILEBLITTING=y
diff --exclude .svn -ruN /home/horms/work/debian-kernel/debian-2.6-experimental/debian/arch/amd64/config debian/arch/amd64/config
--- /home/horms/work/debian-kernel/debian-2.6-experimental/debian/arch/amd64/config 2005-09-15 11:30:56.000000000 +0900
+++ debian/arch/amd64/config 2005-09-15 12:37:00.000000000 +0900
@@ -348,7 +348,6 @@
CONFIG_MD_RAID6=m
CONFIG_MD_FAULTY=m
CONFIG_DM_MULTIPATH_EMC=m
-CONFIG_FUSION=m
CONFIG_FUSION_MAX_SGE=40
CONFIG_FUSION_CTL=m
CONFIG_FUSION_LAN=m
@@ -1193,10 +1192,6 @@
CONFIG_VIDEO_IR=m
CONFIG_VIDEO_TVEEPROM=m
CONFIG_FB=y
-CONFIG_FB_CFB_FILLRECT=m
-CONFIG_FB_CFB_COPYAREA=m
-CONFIG_FB_CFB_IMAGEBLIT=m
-CONFIG_FB_SOFT_CURSOR=m
# CONFIG_FB_MACMODES is not set
CONFIG_FB_MODE_HELPERS=y
CONFIG_FB_TILEBLITTING=y
@@ -1207,7 +1202,6 @@
# CONFIG_FB_ASILIANT is not set
# CONFIG_FB_IMSTT is not set
CONFIG_FB_VGA16=m
-CONFIG_FB_VESA=m
CONFIG_VIDEO_SELECT=y
CONFIG_FB_HGA=m
# CONFIG_FB_HGA_ACCEL is not set
@@ -1645,7 +1639,4 @@
CONFIG_REED_SOLOMON=m
CONFIG_REED_SOLOMON_DEC16=y
CONFIG_HAVE_ARCH_EARLY_PFN_TO_NID=y
-CONFIG_PHYSICAL_START=0x100000
-CONFIG_SELECT_MEMORY_MODEL=y
-# CONFIG_KEXEC is not set
CONFIG_CRYPTO_AES_X86_64=m
diff --exclude .svn -ruN /home/horms/work/debian-kernel/debian-2.6-experimental/debian/arch/amd64/config.amd64-generic debian/arch/amd64/config.amd64-generic
--- /home/horms/work/debian-kernel/debian-2.6-experimental/debian/arch/amd64/config.amd64-generic 2005-09-15 11:30:56.000000000 +0900
+++ debian/arch/amd64/config.amd64-generic 2005-09-15 12:37:00.000000000 +0900
@@ -48,8 +48,3 @@
CONFIG_FS_MBCACHE=y
# CONFIG_CHECKING is not set
CONFIG_ARCH_FLATMEM_ENABLE=y
-CONFIG_FLATMEM_MANUAL=y
-# CONFIG_SPARSEMEM_MANUAL is not set
-CONFIG_FLAT_NODE_MEM_MAP=y
-CONFIG_FLATMEM=y
-# CONFIG_DISCONTIGMEM_MANUAL is not set
diff --exclude .svn -ruN /home/horms/work/debian-kernel/debian-2.6-experimental/debian/arch/amd64/config.amd64-k8 debian/arch/amd64/config.amd64-k8
--- /home/horms/work/debian-kernel/debian-2.6-experimental/debian/arch/amd64/config.amd64-k8 2005-09-15 11:30:56.000000000 +0900
+++ debian/arch/amd64/config.amd64-k8 2005-09-15 12:37:00.000000000 +0900
@@ -48,8 +48,3 @@
CONFIG_FS_MBCACHE=m
# CONFIG_CHECKING is not set
CONFIG_ARCH_FLATMEM_ENABLE=y
-CONFIG_FLATMEM_MANUAL=y
-# CONFIG_SPARSEMEM_MANUAL is not set
-CONFIG_FLAT_NODE_MEM_MAP=y
-CONFIG_FLATMEM=y
-# CONFIG_DISCONTIGMEM_MANUAL is not set
diff --exclude .svn -ruN /home/horms/work/debian-kernel/debian-2.6-experimental/debian/arch/amd64/config.amd64-k8-smp debian/arch/amd64/config.amd64-k8-smp
--- /home/horms/work/debian-kernel/debian-2.6-experimental/debian/arch/amd64/config.amd64-k8-smp 2005-09-15 11:30:56.000000000 +0900
+++ debian/arch/amd64/config.amd64-k8-smp 2005-09-15 12:37:00.000000000 +0900
@@ -23,11 +23,7 @@
CONFIG_EXT2_FS=m
CONFIG_FS_MBCACHE=m
CONFIG_ARCH_DISCONTIGMEM_DEFAULT=y
-# CONFIG_FLATMEM_MANUAL is not set
CONFIG_NEED_MULTIPLE_NODES=y
CONFIG_ARCH_DISCONTIGMEM_ENABLE=y
-# CONFIG_SPARSEMEM_MANUAL is not set
CONFIG_ARCH_SPARSEMEM_ENABLE=y
-CONFIG_FLAT_NODE_MEM_MAP=y
-CONFIG_DISCONTIGMEM_MANUAL=y
# CONFIG_HOTPLUG_CPU is not set
diff --exclude .svn -ruN /home/horms/work/debian-kernel/debian-2.6-experimental/debian/arch/amd64/config.em64t-p4 debian/arch/amd64/config.em64t-p4
--- /home/horms/work/debian-kernel/debian-2.6-experimental/debian/arch/amd64/config.em64t-p4 2005-09-15 11:30:56.000000000 +0900
+++ debian/arch/amd64/config.em64t-p4 2005-09-15 12:37:00.000000000 +0900
@@ -48,8 +48,3 @@
CONFIG_FS_MBCACHE=m
# CONFIG_CHECKING is not set
CONFIG_ARCH_FLATMEM_ENABLE=y
-CONFIG_FLATMEM_MANUAL=y
-# CONFIG_SPARSEMEM_MANUAL is not set
-CONFIG_FLAT_NODE_MEM_MAP=y
-CONFIG_FLATMEM=y
-# CONFIG_DISCONTIGMEM_MANUAL is not set
diff --exclude .svn -ruN /home/horms/work/debian-kernel/debian-2.6-experimental/debian/arch/amd64/config.em64t-p4-smp debian/arch/amd64/config.em64t-p4-smp
--- /home/horms/work/debian-kernel/debian-2.6-experimental/debian/arch/amd64/config.em64t-p4-smp 2005-09-15 11:30:56.000000000 +0900
+++ debian/arch/amd64/config.em64t-p4-smp 2005-09-15 12:37:00.000000000 +0900
@@ -21,9 +21,4 @@
CONFIG_EXT2_FS=m
CONFIG_FS_MBCACHE=m
CONFIG_ARCH_FLATMEM_ENABLE=y
-CONFIG_FLATMEM_MANUAL=y
-# CONFIG_SPARSEMEM_MANUAL is not set
-CONFIG_FLAT_NODE_MEM_MAP=y
-CONFIG_FLATMEM=y
-# CONFIG_DISCONTIGMEM_MANUAL is not set
# CONFIG_HOTPLUG_CPU is not set
diff --exclude .svn -ruN /home/horms/work/debian-kernel/debian-2.6-experimental/debian/arch/arm/config.footbridge debian/arch/arm/config.footbridge
--- /home/horms/work/debian-kernel/debian-2.6-experimental/debian/arch/arm/config.footbridge 2005-09-15 11:30:55.000000000 +0900
+++ debian/arch/arm/config.footbridge 2005-09-15 12:37:00.000000000 +0900
@@ -363,10 +363,6 @@
# CONFIG_RADIO_TYPHOON is not set
# CONFIG_RADIO_ZOLTRIX is not set
CONFIG_FB=y
-CONFIG_FB_CFB_FILLRECT=y
-CONFIG_FB_CFB_COPYAREA=y
-CONFIG_FB_CFB_IMAGEBLIT=y
-CONFIG_FB_SOFT_CURSOR=y
# CONFIG_FB_MACMODES is not set
# CONFIG_FB_MODE_HELPERS is not set
# CONFIG_FB_TILEBLITTING is not set
diff --exclude .svn -ruN /home/horms/work/debian-kernel/debian-2.6-experimental/debian/arch/arm/config.rpc debian/arch/arm/config.rpc
--- /home/horms/work/debian-kernel/debian-2.6-experimental/debian/arch/arm/config.rpc 2005-09-15 11:30:55.000000000 +0900
+++ debian/arch/arm/config.rpc 2005-09-15 12:37:00.000000000 +0900
@@ -163,10 +163,6 @@
# CONFIG_SENSORS_EEPROM is not set
# CONFIG_VIDEO_DEV is not set
CONFIG_FB=y
-CONFIG_FB_CFB_FILLRECT=y
-CONFIG_FB_CFB_COPYAREA=y
-CONFIG_FB_CFB_IMAGEBLIT=y
-CONFIG_FB_SOFT_CURSOR=y
# CONFIG_FB_MACMODES is not set
# CONFIG_FB_MODE_HELPERS is not set
# CONFIG_FB_TILEBLITTING is not set
diff --exclude .svn -ruN /home/horms/work/debian-kernel/debian-2.6-experimental/debian/arch/arm/config.s3c2410 debian/arch/arm/config.s3c2410
--- /home/horms/work/debian-kernel/debian-2.6-experimental/debian/arch/arm/config.s3c2410 2005-09-15 11:30:55.000000000 +0900
+++ debian/arch/arm/config.s3c2410 2005-09-15 12:37:00.000000000 +0900
@@ -459,10 +459,6 @@
CONFIG_SENSORS_EEPROM=m
# CONFIG_VIDEO_DEV is not set
CONFIG_FB=y
-# CONFIG_FB_CFB_FILLRECT is not set
-# CONFIG_FB_CFB_COPYAREA is not set
-# CONFIG_FB_CFB_IMAGEBLIT is not set
-# CONFIG_FB_SOFT_CURSOR is not set
CONFIG_FB_MODE_HELPERS=y
# CONFIG_FB_TILEBLITTING is not set
# CONFIG_FB_VIRTUAL is not set
diff --exclude .svn -ruN /home/horms/work/debian-kernel/debian-2.6-experimental/debian/arch/config debian/arch/config
--- /home/horms/work/debian-kernel/debian-2.6-experimental/debian/arch/config 2005-09-15 11:30:56.000000000 +0900
+++ debian/arch/config 2005-09-15 12:37:00.000000000 +0900
@@ -401,3 +401,29 @@
CONFIG_SECURITY_SELINUX_DEVELOP=y
CONFIG_SECURITY_SELINUX_AVC_STATS=y
CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1
+CONFIG_HZ_250=y
+# CONFIG_HZ_100 is not set
+CONFIG_FLATMEM_MANUAL=y
+CONFIG_PHYSICAL_START=0x100000
+# CONFIG_MTD_PCMCIA_ANONYMOUS is not set
+# CONFIG_SERIAL_8250_MCA is not set
+CONFIG_SELECT_MEMORY_MODEL=y
+# CONFIG_SPARSEMEM_MANUAL is not set
+# CONFIG_KEXEC is not set
+CONFIG_FLAT_NODE_MEM_MAP=y
+CONFIG_FLATMEM=y
+# CONFIG_ACPI_HOTKEY is not set
+CONFIG_SCSI_QLA2XXX=m
+# CONFIG_DISCONTIGMEM_MANUAL is not set
+# CONFIG_ACPI_SLEEP_PROC_SLEEP is not set
+CONFIG_JFFS2_FS_WRITEBUFFER=y
+# CONFIG_EXT2_FS_XIP is not set
+# CONFIG_HZ_1000 is not set
+CONFIG_HZ=250
+CONFIG_I2O_CONFIG_OLD_IOCTL=y
+CONFIG_FUSION=y
+CONFIG_FB_CFB_IMAGEBLIT=y
+CONFIG_FB_SOFT_CURSOR=y
+CONFIG_FB_VESA=y
+CONFIG_FB_CFB_FILLRECT=y
+CONFIG_FB_CFB_COPYAREA=y
diff --exclude .svn -ruN /home/horms/work/debian-kernel/debian-2.6-experimental/debian/arch/hppa/config debian/arch/hppa/config
--- /home/horms/work/debian-kernel/debian-2.6-experimental/debian/arch/hppa/config 2005-09-15 11:30:56.000000000 +0900
+++ debian/arch/hppa/config 2005-09-15 12:37:00.000000000 +0900
@@ -228,7 +228,6 @@
CONFIG_DM_ZERO=m
CONFIG_DM_MULTIPATH=m
CONFIG_DM_MULTIPATH_EMC=m
-# CONFIG_FUSION is not set
# CONFIG_IEEE1394 is not set
CONFIG_I2O=m
CONFIG_I2O_CONFIG=m
@@ -679,10 +678,6 @@
# CONFIG_VIDEO_DEV is not set
# CONFIG_DVB is not set
CONFIG_FB=y
-CONFIG_FB_CFB_FILLRECT=y
-CONFIG_FB_CFB_COPYAREA=y
-CONFIG_FB_CFB_IMAGEBLIT=y
-CONFIG_FB_SOFT_CURSOR=y
# CONFIG_FB_MACMODES is not set
CONFIG_FB_MODE_HELPERS=y
# CONFIG_FB_TILEBLITTING is not set
diff --exclude .svn -ruN /home/horms/work/debian-kernel/debian-2.6-experimental/debian/arch/i386/config debian/arch/i386/config
--- /home/horms/work/debian-kernel/debian-2.6-experimental/debian/arch/i386/config 2005-09-15 11:30:56.000000000 +0900
+++ debian/arch/i386/config 2005-09-15 12:37:00.000000000 +0900
@@ -442,7 +442,6 @@
CONFIG_MD_RAID6=m
CONFIG_MD_FAULTY=m
CONFIG_DM_MULTIPATH_EMC=m
-CONFIG_FUSION=m
CONFIG_FUSION_MAX_SGE=40
CONFIG_FUSION_CTL=m
CONFIG_FUSION_LAN=m
@@ -1394,10 +1393,6 @@
CONFIG_VIDEO_IR=m
CONFIG_VIDEO_TVEEPROM=m
CONFIG_FB=y
-CONFIG_FB_CFB_FILLRECT=m
-CONFIG_FB_CFB_COPYAREA=m
-CONFIG_FB_CFB_IMAGEBLIT=m
-CONFIG_FB_SOFT_CURSOR=m
# CONFIG_FB_MACMODES is not set
CONFIG_FB_MODE_HELPERS=y
CONFIG_FB_TILEBLITTING=y
@@ -1408,7 +1403,6 @@
# CONFIG_FB_ASILIANT is not set
# CONFIG_FB_IMSTT is not set
CONFIG_FB_VGA16=m
-CONFIG_FB_VESA=m
CONFIG_VIDEO_SELECT=y
CONFIG_FB_HGA=m
# CONFIG_FB_HGA_ACCEL is not set
diff --exclude .svn -ruN /home/horms/work/debian-kernel/debian-2.6-experimental/debian/arch/ia64/config debian/arch/ia64/config
--- /home/horms/work/debian-kernel/debian-2.6-experimental/debian/arch/ia64/config 2005-09-15 11:30:56.000000000 +0900
+++ debian/arch/ia64/config 2005-09-15 12:37:00.000000000 +0900
@@ -288,7 +288,6 @@
CONFIG_MD_RAID6=m
CONFIG_MD_FAULTY=m
CONFIG_DM_MULTIPATH_EMC=m
-CONFIG_FUSION=m
CONFIG_FUSION_MAX_SGE=40
CONFIG_FUSION_CTL=m
CONFIG_FUSION_LAN=m
@@ -961,10 +960,6 @@
CONFIG_VIDEO_IR=m
CONFIG_VIDEO_TVEEPROM=m
CONFIG_FB=y
-CONFIG_FB_CFB_FILLRECT=y
-CONFIG_FB_CFB_COPYAREA=y
-CONFIG_FB_CFB_IMAGEBLIT=y
-CONFIG_FB_SOFT_CURSOR=y
# CONFIG_FB_MACMODES is not set
CONFIG_FB_MODE_HELPERS=y
CONFIG_FB_TILEBLITTING=y
diff --exclude .svn -ruN /home/horms/work/debian-kernel/debian-2.6-experimental/debian/arch/m68k/config.amiga debian/arch/m68k/config.amiga
--- /home/horms/work/debian-kernel/debian-2.6-experimental/debian/arch/m68k/config.amiga 2005-09-15 11:30:56.000000000 +0900
+++ debian/arch/m68k/config.amiga 2005-09-15 12:37:00.000000000 +0900
@@ -154,10 +154,6 @@
# CONFIG_TIPAR is not set
CONFIG_GEN_RTC=m
CONFIG_FB=y
-CONFIG_FB_CFB_FILLRECT=y
-CONFIG_FB_CFB_COPYAREA=y
-CONFIG_FB_CFB_IMAGEBLIT=y
-CONFIG_FB_SOFT_CURSOR=y
# CONFIG_FB_MACMODES is not set
# CONFIG_FB_MODE_HELPERS is not set
# CONFIG_FB_TILEBLITTING is not set
diff --exclude .svn -ruN /home/horms/work/debian-kernel/debian-2.6-experimental/debian/arch/m68k/config.atari debian/arch/m68k/config.atari
--- /home/horms/work/debian-kernel/debian-2.6-experimental/debian/arch/m68k/config.atari 2005-09-15 11:30:56.000000000 +0900
+++ debian/arch/m68k/config.atari 2005-09-15 12:37:00.000000000 +0900
@@ -75,10 +75,6 @@
CONFIG_NVRAM=y
CONFIG_GEN_RTC=y
CONFIG_FB=y
-# CONFIG_FB_CFB_FILLRECT is not set
-# CONFIG_FB_CFB_COPYAREA is not set
-# CONFIG_FB_CFB_IMAGEBLIT is not set
-# CONFIG_FB_SOFT_CURSOR is not set
# CONFIG_FB_MACMODES is not set
# CONFIG_FB_MODE_HELPERS is not set
# CONFIG_FB_TILEBLITTING is not set
diff --exclude .svn -ruN /home/horms/work/debian-kernel/debian-2.6-experimental/debian/arch/m68k/config.mac debian/arch/m68k/config.mac
--- /home/horms/work/debian-kernel/debian-2.6-experimental/debian/arch/m68k/config.mac 2005-09-15 11:30:56.000000000 +0900
+++ debian/arch/m68k/config.mac 2005-09-15 12:37:00.000000000 +0900
@@ -78,10 +78,6 @@
# CONFIG_SERIAL_8250 is not set
CONFIG_GEN_RTC=m
CONFIG_FB=y
-CONFIG_FB_CFB_FILLRECT=y
-CONFIG_FB_CFB_COPYAREA=y
-CONFIG_FB_CFB_IMAGEBLIT=y
-CONFIG_FB_SOFT_CURSOR=y
CONFIG_FB_MACMODES=y
# CONFIG_FB_MODE_HELPERS is not set
# CONFIG_FB_TILEBLITTING is not set
diff --exclude .svn -ruN /home/horms/work/debian-kernel/debian-2.6-experimental/debian/arch/m68k/config.mvme147 debian/arch/m68k/config.mvme147
--- /home/horms/work/debian-kernel/debian-2.6-experimental/debian/arch/m68k/config.mvme147 2005-09-15 11:30:56.000000000 +0900
+++ debian/arch/m68k/config.mvme147 2005-09-15 12:37:00.000000000 +0900
@@ -47,10 +47,6 @@
# CONFIG_SERIAL_8250 is not set
CONFIG_GEN_RTC=m
CONFIG_FB=y
-# CONFIG_FB_CFB_FILLRECT is not set
-# CONFIG_FB_CFB_COPYAREA is not set
-# CONFIG_FB_CFB_IMAGEBLIT is not set
-# CONFIG_FB_SOFT_CURSOR is not set
# CONFIG_FB_MACMODES is not set
# CONFIG_FB_MODE_HELPERS is not set
# CONFIG_FB_TILEBLITTING is not set
diff --exclude .svn -ruN /home/horms/work/debian-kernel/debian-2.6-experimental/debian/arch/m68k/config.mvme16x debian/arch/m68k/config.mvme16x
--- /home/horms/work/debian-kernel/debian-2.6-experimental/debian/arch/m68k/config.mvme16x 2005-09-15 11:30:56.000000000 +0900
+++ debian/arch/m68k/config.mvme16x 2005-09-15 12:37:00.000000000 +0900
@@ -50,10 +50,6 @@
# CONFIG_SERIAL_8250 is not set
CONFIG_GEN_RTC=m
CONFIG_FB=y
-# CONFIG_FB_CFB_FILLRECT is not set
-# CONFIG_FB_CFB_COPYAREA is not set
-# CONFIG_FB_CFB_IMAGEBLIT is not set
-# CONFIG_FB_SOFT_CURSOR is not set
# CONFIG_FB_MACMODES is not set
# CONFIG_FB_MODE_HELPERS is not set
# CONFIG_FB_TILEBLITTING is not set
diff --exclude .svn -ruN /home/horms/work/debian-kernel/debian-2.6-experimental/debian/arch/m68k/config.q40 debian/arch/m68k/config.q40
--- /home/horms/work/debian-kernel/debian-2.6-experimental/debian/arch/m68k/config.q40 2005-09-15 11:30:56.000000000 +0900
+++ debian/arch/m68k/config.q40 2005-09-15 12:37:00.000000000 +0900
@@ -94,10 +94,6 @@
# CONFIG_SERIAL_8250 is not set
CONFIG_GEN_RTC=m
CONFIG_FB=y
-CONFIG_FB_CFB_FILLRECT=y
-CONFIG_FB_CFB_COPYAREA=y
-CONFIG_FB_CFB_IMAGEBLIT=y
-CONFIG_FB_SOFT_CURSOR=y
# CONFIG_FB_MACMODES is not set
# CONFIG_FB_MODE_HELPERS is not set
# CONFIG_FB_TILEBLITTING is not set
diff --exclude .svn -ruN /home/horms/work/debian-kernel/debian-2.6-experimental/debian/arch/m68k/config.sun3 debian/arch/m68k/config.sun3
--- /home/horms/work/debian-kernel/debian-2.6-experimental/debian/arch/m68k/config.sun3 2005-09-15 11:30:56.000000000 +0900
+++ debian/arch/m68k/config.sun3 2005-09-15 12:37:00.000000000 +0900
@@ -35,10 +35,6 @@
# CONFIG_SERIAL_8250 is not set
CONFIG_GEN_RTC=y
CONFIG_FB=y
-# CONFIG_FB_CFB_FILLRECT is not set
-# CONFIG_FB_CFB_COPYAREA is not set
-# CONFIG_FB_CFB_IMAGEBLIT is not set
-# CONFIG_FB_SOFT_CURSOR is not set
# CONFIG_FB_MACMODES is not set
# CONFIG_FB_MODE_HELPERS is not set
# CONFIG_FB_TILEBLITTING is not set
diff --exclude .svn -ruN /home/horms/work/debian-kernel/debian-2.6-experimental/debian/arch/powerpc/config debian/arch/powerpc/config
--- /home/horms/work/debian-kernel/debian-2.6-experimental/debian/arch/powerpc/config 2005-09-15 11:30:56.000000000 +0900
+++ debian/arch/powerpc/config 2005-09-15 12:37:00.000000000 +0900
@@ -234,7 +234,6 @@
CONFIG_MD_RAID6=m
CONFIG_MD_FAULTY=m
CONFIG_DM_MULTIPATH_EMC=m
-CONFIG_FUSION=m
CONFIG_FUSION_MAX_SGE=40
CONFIG_FUSION_CTL=m
# CONFIG_FUSION_LAN is not set
@@ -255,7 +254,6 @@
CONFIG_IEEE1394_AMDTP=m
CONFIG_I2O=m
CONFIG_I2O_CONFIG=m
-CONFIG_I2O_CONFIG_OLD_IOCTL=y
CONFIG_I2O_BLOCK=m
CONFIG_I2O_SCSI=m
CONFIG_I2O_PROC=m
@@ -947,10 +945,6 @@
CONFIG_VIDEO_IR=m
CONFIG_VIDEO_TVEEPROM=m
CONFIG_FB=y
-CONFIG_FB_CFB_FILLRECT=y
-CONFIG_FB_CFB_COPYAREA=y
-CONFIG_FB_CFB_IMAGEBLIT=y
-CONFIG_FB_SOFT_CURSOR=y
CONFIG_FB_MACMODES=y
CONFIG_FB_MODE_HELPERS=y
CONFIG_FB_TILEBLITTING=y
@@ -1238,7 +1232,6 @@
CONFIG_EXT2_FS_XATTR=y
CONFIG_EXT2_FS_POSIX_ACL=y
CONFIG_EXT2_FS_SECURITY=y
-CONFIG_EXT2_FS_XIP=n
CONFIG_EXT3_FS=m
CONFIG_EXT3_FS_SECURITY=y
CONFIG_JBD=m
@@ -1326,9 +1319,4 @@
# CONFIG_XMON is not set
# CONFIG_BDI_SWITCH is not set
CONFIG_BOOTX_TEXT=y
-CONFIG_KEXEC=y
CONFIG_PMAC_MEDIABAY=y
-# CONFIG_HZ_100 is not set
-# CONFIG_HZ_250 is not set
-CONFIG_HZ_1000=y
-CONFIG_HZ=1000
diff --exclude .svn -ruN /home/horms/work/debian-kernel/debian-2.6-experimental/debian/arch/powerpc/config.powerpc64 debian/arch/powerpc/config.powerpc64
--- /home/horms/work/debian-kernel/debian-2.6-experimental/debian/arch/powerpc/config.powerpc64 2005-09-15 11:30:56.000000000 +0900
+++ debian/arch/powerpc/config.powerpc64 2005-09-15 12:37:00.000000000 +0900
@@ -62,8 +62,5 @@
CONFIG_SYSVIPC_COMPAT=y
CONFIG_THERM_PM72=y
CONFIG_U3_DART=y
-# CONFIG_FLATMEM_MANUAL is not set
-CONFIG_DISCONTIGMEM_MANUAL=y
-# CONFIG_SPARSEMEM_MANUAL is not set
CONFIG_I2O_EXT_ADAPTEC_DMA64=y
CONFIG_WATCHDOG_RTAS=m
diff --exclude .svn -ruN /home/horms/work/debian-kernel/debian-2.6-experimental/debian/arch/s390/config debian/arch/s390/config
--- /home/horms/work/debian-kernel/debian-2.6-experimental/debian/arch/s390/config 2005-09-15 11:30:56.000000000 +0900
+++ debian/arch/s390/config 2005-09-15 12:37:00.000000000 +0900
@@ -195,7 +195,6 @@
# CONFIG_NETCONSOLE is not set
CONFIG_EXT2_FS=y
# CONFIG_EXT2_FS_XATTR is not set
-# CONFIG_EXT2_FS_XIP is not set
CONFIG_EXT3_FS=y
# CONFIG_EXT3_FS_SECURITY is not set
CONFIG_JBD=y
@@ -249,4 +248,3 @@
CONFIG_CRYPTO_DES_Z990=m
# CONFIG_CRC_CCITT is not set
CONFIG_CRC32=m
-CONFIG_KEXEC=y
diff --exclude .svn -ruN /home/horms/work/debian-kernel/debian-2.6-experimental/debian/arch/sparc/config debian/arch/sparc/config
--- /home/horms/work/debian-kernel/debian-2.6-experimental/debian/arch/sparc/config 2005-09-15 11:30:56.000000000 +0900
+++ debian/arch/sparc/config 2005-09-15 12:37:00.000000000 +0900
@@ -25,10 +25,6 @@
CONFIG_PRINTER=m
CONFIG_FW_LOADER=m
CONFIG_FB=y
-CONFIG_FB_CFB_FILLRECT=y
-CONFIG_FB_CFB_COPYAREA=y
-CONFIG_FB_CFB_IMAGEBLIT=y
-CONFIG_FB_SOFT_CURSOR=y
# CONFIG_FB_MACMODES is not set
# CONFIG_FB_TILEBLITTING is not set
# CONFIG_FB_CIRRUS is not set
diff --exclude .svn -ruN /home/horms/work/debian-kernel/debian-2.6-experimental/debian/arch/sparc/config.sparc64 debian/arch/sparc/config.sparc64
--- /home/horms/work/debian-kernel/debian-2.6-experimental/debian/arch/sparc/config.sparc64 2005-09-15 11:30:56.000000000 +0900
+++ debian/arch/sparc/config.sparc64 2005-09-15 12:37:00.000000000 +0900
@@ -129,7 +129,6 @@
CONFIG_SCSI_LPFC=m
CONFIG_SCSI_DC395x=m
CONFIG_SCSI_SUNESP=m
-CONFIG_FUSION=m
CONFIG_FUSION_MAX_SGE=40
CONFIG_FUSION_CTL=m
CONFIG_FUSION_LAN=m
diff --exclude .svn -ruN /home/horms/work/debian-kernel/debian-2.6-experimental/debian/arch/sparc/config.sparc64-smp debian/arch/sparc/config.sparc64-smp
--- /home/horms/work/debian-kernel/debian-2.6-experimental/debian/arch/sparc/config.sparc64-smp 2005-09-15 11:30:56.000000000 +0900
+++ debian/arch/sparc/config.sparc64-smp 2005-09-15 12:37:00.000000000 +0900
@@ -133,7 +133,6 @@
CONFIG_SCSI_LPFC=m
CONFIG_SCSI_DC395x=m
CONFIG_SCSI_SUNESP=m
-CONFIG_FUSION=m
CONFIG_FUSION_MAX_SGE=40
CONFIG_FUSION_CTL=m
CONFIG_FUSION_LAN=m
Reply to: