diff options
author | Mike Frysinger <vapier.adi@gmail.com> | 2009-02-04 16:49:45 +0800 |
---|---|---|
committer | Bryan Wu <cooloney@kernel.org> | 2009-02-04 16:49:45 +0800 |
commit | f556309ea0d6a4adb0ad9775e5a18aa3564a0e4f (patch) | |
tree | 117a8d8421622a3125cc3656dff729bc644b268f /arch/blackfin/mach-bf548 | |
parent | 881eb621fc191e58fa638c533073683be2b63c24 (diff) | |
download | kernel_samsung_smdk4412-f556309ea0d6a4adb0ad9775e5a18aa3564a0e4f.zip kernel_samsung_smdk4412-f556309ea0d6a4adb0ad9775e5a18aa3564a0e4f.tar.gz kernel_samsung_smdk4412-f556309ea0d6a4adb0ad9775e5a18aa3564a0e4f.tar.bz2 |
Blackfin arch: cleanup bf54x ifdef mess in gpio code
merge more of the bf54x and !bf54x gpio code together to
cut down on #ifdef mess
Signed-off-by: Mike Frysinger <vapier.adi@gmail.com>
Signed-off-by: Bryan Wu <cooloney@kernel.org>
Diffstat (limited to 'arch/blackfin/mach-bf548')
-rw-r--r-- | arch/blackfin/mach-bf548/include/mach/gpio.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/blackfin/mach-bf548/include/mach/gpio.h b/arch/blackfin/mach-bf548/include/mach/gpio.h index bba82dc..3a20517 100644 --- a/arch/blackfin/mach-bf548/include/mach/gpio.h +++ b/arch/blackfin/mach-bf548/include/mach/gpio.h @@ -195,17 +195,17 @@ struct gpio_port_t { unsigned short port_fer; unsigned short dummy1; - unsigned short port_data; + unsigned short data; unsigned short dummy2; - unsigned short port_set; + unsigned short data_set; unsigned short dummy3; - unsigned short port_clear; + unsigned short data_clear; unsigned short dummy4; - unsigned short port_dir_set; + unsigned short dir_set; unsigned short dummy5; - unsigned short port_dir_clear; + unsigned short dir_clear; unsigned short dummy6; - unsigned short port_inen; + unsigned short inen; unsigned short dummy7; unsigned int port_mux; }; |