From 84c91afe33207073ae5d863c02f48e31fa8ce1bc Mon Sep 17 00:00:00 2001 From: Bastian Blank Date: Sun, 8 Sep 2013 14:35:12 +0000 Subject: [PATCH] * debian/changelog: Update. * debian/config: Remove FONT* overrides. svn path=/dists/trunk/linux/; revision=20575 --- debian/changelog | 1 + debian/config/alpha/config | 7 ------- debian/config/armel/config.versatile | 15 --------------- debian/config/config | 5 +++++ debian/config/hppa/config | 7 ------- debian/config/ia64/config | 7 ------- debian/config/kernelarch-x86/config | 7 ------- debian/config/m68k/config | 9 --------- debian/config/mips/config.4kc-malta | 7 ------- debian/config/mips/config.5kc-malta | 7 ------- debian/config/mips/config.r4k-ip22 | 7 ------- debian/config/mips/config.r5k-ip32 | 7 ------- debian/config/mips/config.sb1-bcm91250a | 7 ------- debian/config/mips/config.sb1a-bcm91480b | 7 ------- debian/config/powerpc/config | 7 ------- debian/config/sh4/config.sh7751r | 6 ------ debian/config/sh4/config.sh7785lcr | 6 ------ debian/config/sparc/config | 8 -------- 18 files changed, 6 insertions(+), 121 deletions(-) diff --git a/debian/changelog b/debian/changelog index 208c50cdc..3cce528d9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -46,6 +46,7 @@ linux (3.11-1~exp1) UNRELEASED; urgency=low [ Bastian Blank ] * Symlink doc directory in linux-headers packages. * Make gcc-4.8 the default compiler. + * Use default font selection. -- Ben Hutchings Sun, 01 Sep 2013 18:45:47 +0100 diff --git a/debian/config/alpha/config b/debian/config/alpha/config index 0b5f9115f..a747b0816 100644 --- a/debian/config/alpha/config +++ b/debian/config/alpha/config @@ -970,13 +970,6 @@ CONFIG_BINFMT_EM86=m #. TODO CONFIG_CRC32=m -## -## file: lib/fonts/Kconfig -## -# CONFIG_FONTS is not set -CONFIG_FONT_8x8=y -CONFIG_FONT_8x16=y - ## ## file: net/ax25/Kconfig ## diff --git a/debian/config/armel/config.versatile b/debian/config/armel/config.versatile index f9618083b..134bd42fd 100644 --- a/debian/config/armel/config.versatile +++ b/debian/config/armel/config.versatile @@ -475,21 +475,6 @@ CONFIG_UNUSED_SYMBOLS=y # CONFIG_FRAME_POINTER is not set CONFIG_DEBUG_BUGVERBOSE=y -## -## file: lib/fonts/Kconfig -## -CONFIG_FONTS=y -CONFIG_FONT_8x8=y -CONFIG_FONT_8x16=y -# CONFIG_FONT_6x11 is not set -# CONFIG_FONT_7x14 is not set -# CONFIG_FONT_PEARL_8x8 is not set -# CONFIG_FONT_ACORN_8x8 is not set -# CONFIG_FONT_MINI_4x6 is not set -# CONFIG_FONT_SUN8x16 is not set -# CONFIG_FONT_SUN12x22 is not set -# CONFIG_FONT_10x18 is not set - ## ## file: mm/Kconfig ## diff --git a/debian/config/config b/debian/config/config index 5f04550dd..ba71cd288 100644 --- a/debian/config/config +++ b/debian/config/config @@ -4596,6 +4596,11 @@ CONFIG_DEBUG_BUGVERBOSE=y # CONFIG_FIREWIRE_OHCI_REMOTE_DMA is not set # CONFIG_DMA_API_DEBUG is not set +## +## file: lib/fonts/Kconfig +## +# CONFIG_FONTS is not set + ## ## file: lib/Kconfig.kgdb ## diff --git a/debian/config/hppa/config b/debian/config/hppa/config index 06f86bf1f..6e00d374b 100644 --- a/debian/config/hppa/config +++ b/debian/config/hppa/config @@ -585,13 +585,6 @@ CONFIG_ROOT_NFS=y ## # CONFIG_LOCKUP_DETECTOR is not set -## -## file: lib/fonts/Kconfig -## -# CONFIG_FONTS is not set -CONFIG_FONT_8x8=y -CONFIG_FONT_8x16=y - ## ## file: mm/Kconfig ## diff --git a/debian/config/ia64/config b/debian/config/ia64/config index 5338310d7..128226830 100644 --- a/debian/config/ia64/config +++ b/debian/config/ia64/config @@ -768,13 +768,6 @@ CONFIG_FB_TRIDENT=m CONFIG_VGA_CONSOLE=y CONFIG_FRAMEBUFFER_CONSOLE=y -## -## file: lib/fonts/Kconfig -## -# CONFIG_FONTS is not set -CONFIG_FONT_8x8=y -CONFIG_FONT_8x16=y - ## ## file: net/ax25/Kconfig ## diff --git a/debian/config/kernelarch-x86/config b/debian/config/kernelarch-x86/config index ce07b200e..da9d8b990 100644 --- a/debian/config/kernelarch-x86/config +++ b/debian/config/kernelarch-x86/config @@ -1622,13 +1622,6 @@ CONFIG_SPARSE_IRQ=y # CONFIG_DEBUG_STRICT_USER_COPY_CHECKS is not set # CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set -## -## file: lib/fonts/Kconfig -## -# CONFIG_FONTS is not set -CONFIG_FONT_8x8=y -CONFIG_FONT_8x16=y - ## ## file: mm/Kconfig ## diff --git a/debian/config/m68k/config b/debian/config/m68k/config index fb00aab9c..ca3659e31 100644 --- a/debian/config/m68k/config +++ b/debian/config/m68k/config @@ -789,15 +789,6 @@ CONFIG_HZ_PERIODIC=y # CONFIG_SCHED_DEBUG is not set # CONFIG_TIMER_STATS is not set -## -## file: lib/fonts/Kconfig -## -CONFIG_FONTS=y -CONFIG_FONT_8x8=y -CONFIG_FONT_8x16=y -CONFIG_FONT_6x11=y -CONFIG_FONT_PEARL_8x8=y - ## ## file: lib/xz/Kconfig ## diff --git a/debian/config/mips/config.4kc-malta b/debian/config/mips/config.4kc-malta index 3d623c12d..90c98646a 100644 --- a/debian/config/mips/config.4kc-malta +++ b/debian/config/mips/config.4kc-malta @@ -1009,13 +1009,6 @@ CONFIG_ENABLE_MUST_CHECK=y CONFIG_UNUSED_SYMBOLS=y # CONFIG_HEADERS_CHECK is not set -## -## file: lib/fonts/Kconfig -## -# CONFIG_FONTS is not set -CONFIG_FONT_8x8=y -CONFIG_FONT_8x16=y - ## ## file: mm/Kconfig ## diff --git a/debian/config/mips/config.5kc-malta b/debian/config/mips/config.5kc-malta index 7f304e85e..9afeba953 100644 --- a/debian/config/mips/config.5kc-malta +++ b/debian/config/mips/config.5kc-malta @@ -1013,13 +1013,6 @@ CONFIG_ENABLE_MUST_CHECK=y CONFIG_UNUSED_SYMBOLS=y # CONFIG_HEADERS_CHECK is not set -## -## file: lib/fonts/Kconfig -## -# CONFIG_FONTS is not set -CONFIG_FONT_8x8=y -CONFIG_FONT_8x16=y - ## ## file: mm/Kconfig ## diff --git a/debian/config/mips/config.r4k-ip22 b/debian/config/mips/config.r4k-ip22 index b3ef62e45..a8a240047 100644 --- a/debian/config/mips/config.r4k-ip22 +++ b/debian/config/mips/config.r4k-ip22 @@ -430,13 +430,6 @@ CONFIG_INDYDOG=m ## # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set -## -## file: lib/fonts/Kconfig -## -# CONFIG_FONTS is not set -CONFIG_FONT_8x8=y -CONFIG_FONT_8x16=y - ## ## file: mm/Kconfig ## diff --git a/debian/config/mips/config.r5k-ip32 b/debian/config/mips/config.r5k-ip32 index b219ad62f..774f870a6 100644 --- a/debian/config/mips/config.r5k-ip32 +++ b/debian/config/mips/config.r5k-ip32 @@ -574,13 +574,6 @@ CONFIG_FRAMEBUFFER_CONSOLE=y ## # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set -## -## file: lib/fonts/Kconfig -## -# CONFIG_FONTS is not set -CONFIG_FONT_8x8=y -CONFIG_FONT_8x16=y - ## ## file: mm/Kconfig ## diff --git a/debian/config/mips/config.sb1-bcm91250a b/debian/config/mips/config.sb1-bcm91250a index 1d2c51f3e..bfd4e44b1 100644 --- a/debian/config/mips/config.sb1-bcm91250a +++ b/debian/config/mips/config.sb1-bcm91250a @@ -726,13 +726,6 @@ CONFIG_ROOT_NFS=y ## # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set -## -## file: lib/fonts/Kconfig -## -# CONFIG_FONTS is not set -CONFIG_FONT_8x8=y -CONFIG_FONT_8x16=y - ## ## file: mm/Kconfig ## diff --git a/debian/config/mips/config.sb1a-bcm91480b b/debian/config/mips/config.sb1a-bcm91480b index d7a4645dd..8ab09e7fb 100644 --- a/debian/config/mips/config.sb1a-bcm91480b +++ b/debian/config/mips/config.sb1a-bcm91480b @@ -732,13 +732,6 @@ CONFIG_ROOT_NFS=y ## # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set -## -## file: lib/fonts/Kconfig -## -# CONFIG_FONTS is not set -CONFIG_FONT_8x8=y -CONFIG_FONT_8x16=y - ## ## file: mm/Kconfig ## diff --git a/debian/config/powerpc/config b/debian/config/powerpc/config index 2164766ef..9daac73c5 100644 --- a/debian/config/powerpc/config +++ b/debian/config/powerpc/config @@ -868,13 +868,6 @@ CONFIG_USBPCWATCHDOG=m # CONFIG_DEBUG_STACK_USAGE is not set # CONFIG_DEBUG_STACKOVERFLOW is not set -## -## file: lib/fonts/Kconfig -## -# CONFIG_FONTS is not set -CONFIG_FONT_8x8=y -CONFIG_FONT_8x16=y - ## ## file: net/ax25/Kconfig ## diff --git a/debian/config/sh4/config.sh7751r b/debian/config/sh4/config.sh7751r index 77d4f3105..d83a62ec7 100644 --- a/debian/config/sh4/config.sh7751r +++ b/debian/config/sh4/config.sh7751r @@ -168,12 +168,6 @@ CONFIG_FRAMEBUFFER_CONSOLE=y CONFIG_NO_HZ=y CONFIG_HIGH_RES_TIMERS=y -## -## file: lib/fonts/Kconfig -## -CONFIG_FONT_8x8=y -CONFIG_FONT_8x16=y - ## ## file: mm/Kconfig ## diff --git a/debian/config/sh4/config.sh7785lcr b/debian/config/sh4/config.sh7785lcr index 0e46ef9dd..f1d5df484 100644 --- a/debian/config/sh4/config.sh7785lcr +++ b/debian/config/sh4/config.sh7785lcr @@ -221,12 +221,6 @@ CONFIG_SH_WDT=y CONFIG_NO_HZ=y CONFIG_HIGH_RES_TIMERS=y -## -## file: lib/fonts/Kconfig -## -CONFIG_FONT_8x8=y -CONFIG_FONT_8x16=y - ## ## file: mm/Kconfig ## diff --git a/debian/config/sparc/config b/debian/config/sparc/config index 8b1f99925..576cd3891 100644 --- a/debian/config/sparc/config +++ b/debian/config/sparc/config @@ -520,14 +520,6 @@ CONFIG_FRAMEBUFFER_CONSOLE=y ## # CONFIG_W1 is not set -## -## file: lib/fonts/Kconfig -## -# CONFIG_FONTS is not set -CONFIG_FONT_8x16=y -CONFIG_FONT_SUN8x16=y -# CONFIG_FONT_SUN12x22 is not set - ## ## file: mm/Kconfig ##