diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-19 08:47:57 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-19 08:47:57 -0400 |
commit | 40d743b8c16a8cf6e30c1d941aa6147f9550ea75 (patch) | |
tree | 9fcdf9a06b18a275253048d1ea7c9803cec38845 /arch/blackfin/kernel/bfin_gpio.c | |
parent | 7da18afa423f167e7ef3c9728e584d8bf05bd55a (diff) | |
parent | 83e686ea0291ee93b87dcdc00b96443b80de56c9 (diff) |
Merge branch 'for-rmk' of git://linux-arm.org/linux-2.6
Diffstat (limited to 'arch/blackfin/kernel/bfin_gpio.c')
-rw-r--r-- | arch/blackfin/kernel/bfin_gpio.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/blackfin/kernel/bfin_gpio.c b/arch/blackfin/kernel/bfin_gpio.c index 6b9446271371..fc4681c0170e 100644 --- a/arch/blackfin/kernel/bfin_gpio.c +++ b/arch/blackfin/kernel/bfin_gpio.c | |||
@@ -722,7 +722,6 @@ void bfin_gpio_pm_hibernate_suspend(void) | |||
722 | gpio_bank_saved[bank].fer = gpio_array[bank]->port_fer; | 722 | gpio_bank_saved[bank].fer = gpio_array[bank]->port_fer; |
723 | gpio_bank_saved[bank].mux = gpio_array[bank]->port_mux; | 723 | gpio_bank_saved[bank].mux = gpio_array[bank]->port_mux; |
724 | gpio_bank_saved[bank].data = gpio_array[bank]->data; | 724 | gpio_bank_saved[bank].data = gpio_array[bank]->data; |
725 | gpio_bank_saved[bank].data = gpio_array[bank]->data; | ||
726 | gpio_bank_saved[bank].inen = gpio_array[bank]->inen; | 725 | gpio_bank_saved[bank].inen = gpio_array[bank]->inen; |
727 | gpio_bank_saved[bank].dir = gpio_array[bank]->dir_set; | 726 | gpio_bank_saved[bank].dir = gpio_array[bank]->dir_set; |
728 | } | 727 | } |