From 4b45b188ad36906dd4a2da8c2288bca172df8b08 Mon Sep 17 00:00:00 2001 From: Bastian Blank Date: Thu, 21 Jan 2010 15:20:33 +0000 Subject: [PATCH] debian/config: Unify partition selection. svn path=/dists/trunk/linux-2.6/; revision=14967 --- debian/config/alpha/config | 1 - debian/config/config | 14 ++++++++++++++ debian/config/m68k/config.mac | 6 ------ debian/config/mips/config.r4k-ip22 | 2 -- debian/config/mips/config.r5k-ip32 | 15 --------------- debian/config/mips/config.sb1-bcm91250a | 15 --------------- debian/config/mips/config.sb1a-bcm91480b | 15 --------------- debian/config/powerpc/config | 11 ----------- debian/config/s390/config | 13 ------------- debian/config/sparc/config | 12 ------------ 10 files changed, 14 insertions(+), 90 deletions(-) diff --git a/debian/config/alpha/config b/debian/config/alpha/config index d15f34186..ada3400d0 100644 --- a/debian/config/alpha/config +++ b/debian/config/alpha/config @@ -1079,7 +1079,6 @@ CONFIG_LDM_PARTITION=y CONFIG_SGI_PARTITION=y CONFIG_ULTRIX_PARTITION=y CONFIG_SUN_PARTITION=y -# CONFIG_EFI_PARTITION is not set ## ## file: init/Kconfig diff --git a/debian/config/config b/debian/config/config index 100ea91e5..3d76b2a36 100644 --- a/debian/config/config +++ b/debian/config/config @@ -2995,8 +2995,22 @@ CONFIG_OMFS_FS=m ## file: fs/partitions/Kconfig ## CONFIG_PARTITION_ADVANCED=y +# CONFIG_ACORN_PARTITION is not set +# CONFIG_OSF_PARTITION is not set +# CONFIG_AMIGA_PARTITION is not set +# CONFIG_ATARI_PARTITION is not set +# CONFIG_MAC_PARTITION is not set CONFIG_MSDOS_PARTITION=y +# CONFIG_BSD_DISKLABEL is not set +# CONFIG_MINIX_SUBPARTITION is not set +# CONFIG_SOLARIS_X86_PARTITION is not set +# CONFIG_UNIXWARE_DISKLABEL is not set +# CONFIG_LDM_PARTITION is not set +# CONFIG_SGI_PARTITION is not set +# CONFIG_ULTRIX_PARTITION is not set +# CONFIG_SUN_PARTITION is not set CONFIG_KARMA_PARTITION=y +# CONFIG_EFI_PARTITION is not set # CONFIG_SYSV68_PARTITION is not set ## diff --git a/debian/config/m68k/config.mac b/debian/config/m68k/config.mac index d8bfae50a..6645a684b 100644 --- a/debian/config/m68k/config.mac +++ b/debian/config/m68k/config.mac @@ -168,9 +168,6 @@ CONFIG_NCPFS_OS2_NS=y ## ## file: fs/partitions/Kconfig ## -CONFIG_PARTITION_ADVANCED=y -# CONFIG_ACORN_PARTITION is not set -# CONFIG_OSF_PARTITION is not set CONFIG_AMIGA_PARTITION=y CONFIG_ATARI_PARTITION=y CONFIG_MAC_PARTITION=y @@ -180,10 +177,7 @@ CONFIG_SOLARIS_X86_PARTITION=y CONFIG_UNIXWARE_DISKLABEL=y CONFIG_LDM_PARTITION=y CONFIG_LDM_DEBUG=y -# CONFIG_SGI_PARTITION is not set -# CONFIG_ULTRIX_PARTITION is not set CONFIG_SUN_PARTITION=y -# CONFIG_EFI_PARTITION is not set ## ## file: fs/ufs/Kconfig diff --git a/debian/config/mips/config.r4k-ip22 b/debian/config/mips/config.r4k-ip22 index ad45c844f..c34bf8a7e 100644 --- a/debian/config/mips/config.r4k-ip22 +++ b/debian/config/mips/config.r4k-ip22 @@ -503,8 +503,6 @@ CONFIG_EXT3_FS=y ## ## file: fs/partitions/Kconfig ## -CONFIG_PARTITION_ADVANCED=y -CONFIG_MSDOS_PARTITION=y CONFIG_SGI_PARTITION=y CONFIG_KARMA_PARTITION=y diff --git a/debian/config/mips/config.r5k-ip32 b/debian/config/mips/config.r5k-ip32 index ca7541472..98e9c1ac1 100644 --- a/debian/config/mips/config.r5k-ip32 +++ b/debian/config/mips/config.r5k-ip32 @@ -608,23 +608,8 @@ CONFIG_EXT3_FS=y ## ## file: fs/partitions/Kconfig ## -CONFIG_PARTITION_ADVANCED=y -# CONFIG_ACORN_PARTITION is not set -# CONFIG_OSF_PARTITION is not set -# CONFIG_AMIGA_PARTITION is not set -# CONFIG_ATARI_PARTITION is not set -# CONFIG_MAC_PARTITION is not set -CONFIG_MSDOS_PARTITION=y -# CONFIG_BSD_DISKLABEL is not set -# CONFIG_MINIX_SUBPARTITION is not set -# CONFIG_SOLARIS_X86_PARTITION is not set -# CONFIG_UNIXWARE_DISKLABEL is not set -# CONFIG_LDM_PARTITION is not set CONFIG_SGI_PARTITION=y -# CONFIG_ULTRIX_PARTITION is not set -# CONFIG_SUN_PARTITION is not set CONFIG_KARMA_PARTITION=y -# CONFIG_EFI_PARTITION is not set ## ## file: init/Kconfig diff --git a/debian/config/mips/config.sb1-bcm91250a b/debian/config/mips/config.sb1-bcm91250a index c3ad2e6e9..d009d74c9 100644 --- a/debian/config/mips/config.sb1-bcm91250a +++ b/debian/config/mips/config.sb1-bcm91250a @@ -737,23 +737,8 @@ CONFIG_ROOT_NFS=y ## ## file: fs/partitions/Kconfig ## -CONFIG_PARTITION_ADVANCED=y -# CONFIG_ACORN_PARTITION is not set -# CONFIG_OSF_PARTITION is not set -# CONFIG_AMIGA_PARTITION is not set -# CONFIG_ATARI_PARTITION is not set -# CONFIG_MAC_PARTITION is not set -CONFIG_MSDOS_PARTITION=y -# CONFIG_BSD_DISKLABEL is not set -# CONFIG_MINIX_SUBPARTITION is not set -# CONFIG_SOLARIS_X86_PARTITION is not set -# CONFIG_UNIXWARE_DISKLABEL is not set -# CONFIG_LDM_PARTITION is not set CONFIG_SGI_PARTITION=y -# CONFIG_ULTRIX_PARTITION is not set -# CONFIG_SUN_PARTITION is not set CONFIG_KARMA_PARTITION=y -# CONFIG_EFI_PARTITION is not set ## ## file: init/Kconfig diff --git a/debian/config/mips/config.sb1a-bcm91480b b/debian/config/mips/config.sb1a-bcm91480b index ef31cf61c..928a01031 100644 --- a/debian/config/mips/config.sb1a-bcm91480b +++ b/debian/config/mips/config.sb1a-bcm91480b @@ -767,23 +767,8 @@ CONFIG_ROOT_NFS=y ## ## file: fs/partitions/Kconfig ## -CONFIG_PARTITION_ADVANCED=y -# CONFIG_ACORN_PARTITION is not set -# CONFIG_OSF_PARTITION is not set -# CONFIG_AMIGA_PARTITION is not set -# CONFIG_ATARI_PARTITION is not set -# CONFIG_MAC_PARTITION is not set -CONFIG_MSDOS_PARTITION=y -# CONFIG_BSD_DISKLABEL is not set -# CONFIG_MINIX_SUBPARTITION is not set -# CONFIG_SOLARIS_X86_PARTITION is not set -# CONFIG_UNIXWARE_DISKLABEL is not set -# CONFIG_LDM_PARTITION is not set CONFIG_SGI_PARTITION=y -# CONFIG_ULTRIX_PARTITION is not set -# CONFIG_SUN_PARTITION is not set CONFIG_KARMA_PARTITION=y -# CONFIG_EFI_PARTITION is not set ## ## file: init/Kconfig diff --git a/debian/config/powerpc/config b/debian/config/powerpc/config index 9e175da68..7a4c37ca1 100644 --- a/debian/config/powerpc/config +++ b/debian/config/powerpc/config @@ -820,19 +820,8 @@ CONFIG_USBPCWATCHDOG=m ## ## file: fs/partitions/Kconfig ## -# CONFIG_ACORN_PARTITION is not set -# CONFIG_OSF_PARTITION is not set CONFIG_AMIGA_PARTITION=y -# CONFIG_ATARI_PARTITION is not set CONFIG_MAC_PARTITION=y -# CONFIG_BSD_DISKLABEL is not set -# CONFIG_MINIX_SUBPARTITION is not set -# CONFIG_SOLARIS_X86_PARTITION is not set -# CONFIG_UNIXWARE_DISKLABEL is not set -# CONFIG_LDM_PARTITION is not set -# CONFIG_SGI_PARTITION is not set -# CONFIG_ULTRIX_PARTITION is not set -# CONFIG_SUN_PARTITION is not set CONFIG_EFI_PARTITION=y ## diff --git a/debian/config/s390/config b/debian/config/s390/config index 375687d93..2dd8936c2 100644 --- a/debian/config/s390/config +++ b/debian/config/s390/config @@ -137,21 +137,8 @@ CONFIG_ZVM_WATCHDOG=m ## ## file: fs/partitions/Kconfig ## -# CONFIG_ACORN_PARTITION is not set -# CONFIG_OSF_PARTITION is not set -# CONFIG_AMIGA_PARTITION is not set -# CONFIG_ATARI_PARTITION is not set CONFIG_IBM_PARTITION=y -# CONFIG_MAC_PARTITION is not set CONFIG_BSD_DISKLABEL=y -# CONFIG_MINIX_SUBPARTITION is not set -# CONFIG_SOLARIS_X86_PARTITION is not set -# CONFIG_UNIXWARE_DISKLABEL is not set -# CONFIG_LDM_PARTITION is not set -# CONFIG_SGI_PARTITION is not set -# CONFIG_ULTRIX_PARTITION is not set -# CONFIG_SUN_PARTITION is not set -# CONFIG_EFI_PARTITION is not set ## ## file: mm/Kconfig diff --git a/debian/config/sparc/config b/debian/config/sparc/config index d31a10718..0855835df 100644 --- a/debian/config/sparc/config +++ b/debian/config/sparc/config @@ -501,18 +501,6 @@ CONFIG_LOGO_SUN_CLUT224=y ## ## file: fs/partitions/Kconfig ## -# CONFIG_ACORN_PARTITION is not set -# CONFIG_OSF_PARTITION is not set -# CONFIG_AMIGA_PARTITION is not set -# CONFIG_ATARI_PARTITION is not set -# CONFIG_MAC_PARTITION is not set -# CONFIG_BSD_DISKLABEL is not set -# CONFIG_MINIX_SUBPARTITION is not set -# CONFIG_SOLARIS_X86_PARTITION is not set -# CONFIG_UNIXWARE_DISKLABEL is not set -# CONFIG_LDM_PARTITION is not set -# CONFIG_SGI_PARTITION is not set -# CONFIG_ULTRIX_PARTITION is not set CONFIG_SUN_PARTITION=y CONFIG_EFI_PARTITION=y