---

yaml --- r: 309018 b: refs/heads/master c: 03751e7 h: refs/heads/master v: v3
git-mirror · May 15, 2012 · 15c0c36 · 15c0c36
1 parent 032de83
commit 15c0c36
Show file tree

Hide file tree

Showing 8 changed files with 1,411 additions and 54 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 442209f31dafef9fde852858e1ce566b675b720d
+refs/heads/master: 03751e792420f88e224ce247dfdd26a6ba3e4091
diff --git a/trunk/arch/mips/Kconfig b/trunk/arch/mips/Kconfig
@@ -1786,12 +1786,10 @@ endchoice
 
 config FORCE_MAX_ZONEORDER
 	int "Maximum zone order"
-	range 14 64 if HUGETLB_PAGE && PAGE_SIZE_64KB
-	default "14" if HUGETLB_PAGE && PAGE_SIZE_64KB
-	range 13 64 if HUGETLB_PAGE && PAGE_SIZE_32KB
-	default "13" if HUGETLB_PAGE && PAGE_SIZE_32KB
-	range 12 64 if HUGETLB_PAGE && PAGE_SIZE_16KB
-	default "12" if HUGETLB_PAGE && PAGE_SIZE_16KB
+	range 13 64 if SYS_SUPPORTS_HUGETLBFS && PAGE_SIZE_32KB
+	default "13" if SYS_SUPPORTS_HUGETLBFS && PAGE_SIZE_32KB
+	range 12 64 if SYS_SUPPORTS_HUGETLBFS && PAGE_SIZE_16KB
+	default "12" if SYS_SUPPORTS_HUGETLBFS && PAGE_SIZE_16KB
 	range 11 64
 	default "11"
 	help

diff --git a/trunk/arch/mips/include/asm/mach-bcm63xx/bcm63xx_gpio.h b/trunk/arch/mips/include/asm/mach-bcm63xx/bcm63xx_gpio.h
@@ -2,7 +2,6 @@
 #define BCM63XX_GPIO_H
 
 #include <linux/init.h>
-#include <bcm63xx_cpu.h>
 
 int __init bcm63xx_gpio_init(void);