diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-15 14:27:22 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-15 14:27:22 -0800 |
commit | 6c0514ddd973ff13c3d2b2e7ac1422c982afb8eb (patch) | |
tree | beccc0d9aa9df71f4af081736e8c0b007dfcb603 /arch/blackfin/mach-bf548/include/mach/gpio.h | |
parent | 98d38dd2ee30322fc9934d7490be3c5bee80950e (diff) | |
parent | 36855dcfc980f247909b8f63776664c6ccb6f183 (diff) | |
download | op-kernel-dev-6c0514ddd973ff13c3d2b2e7ac1422c982afb8eb.zip op-kernel-dev-6c0514ddd973ff13c3d2b2e7ac1422c982afb8eb.tar.gz |
Merge tag 'blackfin-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/realmz6/blackfin-linux
Pull blackfin updates from Steven Miao:
"Blackfin gpio changes, add adi pinctrl driver, and bug fixes"
* tag 'blackfin-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/realmz6/blackfin-linux:
blackfin: fix build warning for unused variable
smp: bf561: and smb_wmb()/smp_rmb() at ipi send/receive
pm: use GFP_ATOMIC when pm core call this function
blackfin: serial: Add serial port_fer and port_mux early platform resources.
blackfin: pinctrl-adi2: code cleanup after using pinctrl-adi2
blackfin: adi gpio driver and pinctrl driver support
bf609: update default config for spi
Blackfin: bfin_gpio: Use proper mask for comparing pfunc
Diffstat (limited to 'arch/blackfin/mach-bf548/include/mach/gpio.h')
-rw-r--r-- | arch/blackfin/mach-bf548/include/mach/gpio.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/arch/blackfin/mach-bf548/include/mach/gpio.h b/arch/blackfin/mach-bf548/include/mach/gpio.h index be9edb2..006da1e 100644 --- a/arch/blackfin/mach-bf548/include/mach/gpio.h +++ b/arch/blackfin/mach-bf548/include/mach/gpio.h @@ -194,14 +194,6 @@ struct gpio_port_t { unsigned int port_mux; }; -struct gpio_port_s { - unsigned short fer; - unsigned short data; - unsigned short dir; - unsigned short inen; - unsigned int mux; -}; - #endif #include <mach-common/ports-a.h> |