Blackfin arch: Clean up trace buffer handling, No major functional changes.

[pandora-kernel.git] / include / asm-blackfin / gpio.h

diff --git a/include/asm-blackfin/gpio.h b/include/asm-blackfin/gpio.h
index aa0d550..bc0cca0 100644 (file)
--- a/include/asm-blackfin/gpio.h
+++ b/include/asm-blackfin/gpio.h
@@ -204,6 +204,10 @@
 
 #endif
 
+#ifdef BF548_FAMILY
+#include <asm-blackfin/mach-bf548/gpio.h>
+#endif
+
 #ifdef BF561_FAMILY
 #define MAX_BLACKFIN_GPIOS 48
 #define PORT_FIO0 GPIO_0
@@ -264,6 +268,7 @@ unsigned short get_gpiop_maska(unsigned short);
 unsigned short get_gpiop_maskb(unsigned short);
 unsigned short get_gpiop_data(unsigned short);
 
+#ifndef BF548_FAMILY
 struct gpio_port_t {
        unsigned short data;
        unsigned short dummy1;
@@ -299,6 +304,7 @@ struct gpio_port_t {
        unsigned short dummy16;
        unsigned short inen;
 };
+#endif
 
 #ifdef CONFIG_PM
 #define PM_WAKE_RISING 0x1
@@ -332,6 +338,7 @@ struct gpio_port_s {
        unsigned short inen;
 
        unsigned short fer;
+       unsigned short reserved;
 };
 #endif /*CONFIG_PM*/