diff --git a/[refs] b/[refs]
index 1e91a813b0d8..688c46ca7c22 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 46fa5eecec58934902ea4a65d9c7b7a486ac6f6b
+refs/heads/master: 2e8ca591479e7127c7a6406cfb54962afbd5a68e
diff --git a/trunk/arch/blackfin/include/asm/gpio.h b/trunk/arch/blackfin/include/asm/gpio.h
index f8fe33b8bca6..ec2ab465709e 100644
--- a/trunk/arch/blackfin/include/asm/gpio.h
+++ b/trunk/arch/blackfin/include/asm/gpio.h
@@ -87,9 +87,9 @@
 #define gpio_bank(x) 	((x) >> 4)
 #define gpio_bit(x)  	(1<<((x) & 0xF))
 #define gpio_sub_n(x) 	((x) & 0xF)
-#define GPIO_BANK_NUM 	DIV_ROUND_UP(MAX_BLACKFIN_GPIOS, 16)
 
-#define GPIO_BANKSIZE 16
+#define GPIO_BANKSIZE 	16
+#define GPIO_BANK_NUM 	DIV_ROUND_UP(MAX_BLACKFIN_GPIOS, GPIO_BANKSIZE)
 
 #define	GPIO_0	0
 #define	GPIO_1	1
diff --git a/trunk/arch/blackfin/include/asm/processor.h b/trunk/arch/blackfin/include/asm/processor.h
index 30703c75030c..2cb0b8711fa4 100644
--- a/trunk/arch/blackfin/include/asm/processor.h
+++ b/trunk/arch/blackfin/include/asm/processor.h
@@ -159,6 +159,8 @@ static inline uint32_t __pure bfin_compiled_revid(void)
 	return 4;
 #elif defined(CONFIG_BF_REV_0_5)
 	return 5;
+#elif defined(CONFIG_BF_REV_0_6)
+	return 6;
 #elif defined(CONFIG_BF_REV_ANY)
 	return 0xffff;
 #else