diff --git a/[refs] b/[refs] index 867f6bdb4c70..2d2a9e4b19cc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6af677ea59fb62ae6b720a9e5e9d5cba32ada553 +refs/heads/master: 1c5f873d1b8f841bd6e1b2c3eda8a81e58224803 diff --git a/trunk/arch/parisc/Kconfig b/trunk/arch/parisc/Kconfig index e077b0bf56ca..fdfd8be29e95 100644 --- a/trunk/arch/parisc/Kconfig +++ b/trunk/arch/parisc/Kconfig @@ -169,9 +169,7 @@ config 64BIT choice prompt "Kernel page size" - default PARISC_PAGE_SIZE_4KB if !64BIT - default PARISC_PAGE_SIZE_4KB if 64BIT -# default PARISC_PAGE_SIZE_16KB if 64BIT + default PARISC_PAGE_SIZE_4KB config PARISC_PAGE_SIZE_4KB bool "4KB"