diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-05-23 02:53:23 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-05-23 02:53:23 -0400 |
| commit | acf464817d5e7be9fb67aec4027dbee0ac9be17a (patch) | |
| tree | 39fd061c0a91a11d3ae4ff19b7fe179325e39bbf /include/asm-blackfin/gpio.h | |
| parent | 80d267f9aee6f1b5df602b5a19fb7b4923f17db2 (diff) | |
| parent | 8962cadbe7cbc4ed0fff94f56ebab505a10afd2e (diff) | |
Merge branch 'merge' into powerpc-next
Diffstat (limited to 'include/asm-blackfin/gpio.h')
| -rw-r--r-- | include/asm-blackfin/gpio.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/asm-blackfin/gpio.h b/include/asm-blackfin/gpio.h index 27ff532a806c..ff95e9d88342 100644 --- a/include/asm-blackfin/gpio.h +++ b/include/asm-blackfin/gpio.h | |||
| @@ -437,7 +437,6 @@ void gpio_set_value(unsigned gpio, int arg); | |||
| 437 | int gpio_get_value(unsigned gpio); | 437 | int gpio_get_value(unsigned gpio); |
| 438 | 438 | ||
| 439 | #ifndef BF548_FAMILY | 439 | #ifndef BF548_FAMILY |
| 440 | #define gpio_get_value(gpio) get_gpio_data(gpio) | ||
| 441 | #define gpio_set_value(gpio, value) set_gpio_data(gpio, value) | 440 | #define gpio_set_value(gpio, value) set_gpio_data(gpio, value) |
| 442 | #endif | 441 | #endif |
| 443 | 442 | ||