diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-05 14:24:16 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-05 14:24:16 +0100 |
| commit | a32737e1ca650504f172292dd344eb64c02311f3 (patch) | |
| tree | 7dd2004ece26081507af877d9dd40b1bd4eecc1a /arch/arm/mach-shmobile/include | |
| parent | ARM: 7267/1: Remove BUILD_BUG_ON from asm/bug.h (diff) | |
| parent | ARM: Update mach-types (diff) | |
| download | linux-a32737e1ca650504f172292dd344eb64c02311f3.tar.xz linux-a32737e1ca650504f172292dd344eb64c02311f3.zip | |
Merge branches 'fixes' and 'misc' into for-linus
Diffstat (limited to 'arch/arm/mach-shmobile/include')
| -rw-r--r-- | arch/arm/mach-shmobile/include/mach/gpio.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/mach-shmobile/include/mach/gpio.h b/arch/arm/mach-shmobile/include/mach/gpio.h index 7bf0890e16ba..de795b42232a 100644 --- a/arch/arm/mach-shmobile/include/mach/gpio.h +++ b/arch/arm/mach-shmobile/include/mach/gpio.h @@ -12,8 +12,6 @@ #include <linux/kernel.h> #include <linux/errno.h> - -#define ARCH_NR_GPIOS 1024 #include <linux/sh_pfc.h> #ifdef CONFIG_GPIOLIB |