diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-09 03:10:14 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-09 03:10:14 -0400 |
commit | dea77ccdc93448d81e495a57bc1c1e97be4fdfe8 (patch) | |
tree | a8b0ed4c01332efa9a00b9a810fa4a00b74e5630 /arch/blackfin/kernel/bfin_gpio.c | |
parent | de390bba797aa9a554bc1769b6a8771605854d79 (diff) | |
parent | 6594b982f6d5f957c8d72de7658bf8e240c7dfca (diff) |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lliubbo/blackfin
Pull blackfin update from Bob Liu.
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lliubbo/blackfin:
Blackfin: smp: add smp_mb() to keep coherency
Blackfin: drop irq enable in init_arch_irq()
Blackfin: fix wrong place disabled irq
Blackfin: update defconfig for bf609-ezkit
Blackfin: add bf548 v0.4 revision
Blackfin: bf60x: Add bf608 and bf609 specific perpheral MMRs
Blackfin: cpufreq: fix dpm_state_table
Blackfin: bfin_gpio: proc: fix return value
Blackfin: CM-BF537E: Update SPORT support in board file.
Blackfin: bf537: fix lq035 platform device name
Blackfin: bf533-ezkit: enable flash drivers by default
Diffstat (limited to 'arch/blackfin/kernel/bfin_gpio.c')
-rw-r--r-- | arch/blackfin/kernel/bfin_gpio.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/blackfin/kernel/bfin_gpio.c b/arch/blackfin/kernel/bfin_gpio.c index 83139aaf3072..ed978f1c5cb9 100644 --- a/arch/blackfin/kernel/bfin_gpio.c +++ b/arch/blackfin/kernel/bfin_gpio.c | |||
@@ -1265,8 +1265,8 @@ static __init int gpio_register_proc(void) | |||
1265 | { | 1265 | { |
1266 | struct proc_dir_entry *proc_gpio; | 1266 | struct proc_dir_entry *proc_gpio; |
1267 | 1267 | ||
1268 | proc_gpio = proc_create("gpio", S_IRUGO, NULL, &gpio_proc_ops); | 1268 | proc_gpio = proc_create("gpio", 0, NULL, &gpio_proc_ops); |
1269 | return proc_gpio != NULL; | 1269 | return proc_gpio == NULL; |
1270 | } | 1270 | } |
1271 | __initcall(gpio_register_proc); | 1271 | __initcall(gpio_register_proc); |
1272 | #endif | 1272 | #endif |