* debian/changelog: Update

* debian/config/kernelarch-powerpc/config-arch-64: Set PPC_64K_PAGES.
* debian/config/kernelarch-powerpc/config-arch-64-le: Remove overriden option.

svn path=/dists/trunk/linux/; revision=21721
This commit is contained in:
Bastian Blank 2014-08-09 19:42:11 +00:00
parent 5703566a44
commit aed63a56b1
3 changed files with 2 additions and 9 deletions

1
debian/changelog vendored
View File

@ -16,6 +16,7 @@ linux (3.16-1~exp1) UNRELEASED; urgency=medium
* [powerpc64, s390x] Enable PCI hotplug.
* Enable RTL8723BE.
* Enable OPROFILE.
* [ppc64] Enable 64KiB pages.
[ Ben Hutchings ]
* udeb: Add new sound drivers to sound-modules (thanks to Samuel Thibault)

View File

@ -6,7 +6,7 @@ CONFIG_PPC_TRANSACTIONAL_MEM=y
CONFIG_IRQ_ALL_CPUS=y
CONFIG_NUMA=y
## choice: Page size
# CONFIG_PPC_64K_PAGES is not set
CONFIG_PPC_64K_PAGES=y
## end choice
CONFIG_SCHED_SMT=y
CONFIG_CMDLINE="console=hvsi0 console=hvc0 console=ttyS0,9600 console=tty0"

View File

@ -1,11 +1,3 @@
##
## file: arch/powerpc/Kconfig
##
## choice: Page size
# CONFIG_PPC_4K_PAGES is not set
CONFIG_PPC_64K_PAGES=y
## end choice
##
## file: arch/powerpc/platforms/Kconfig.cputype
##