diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2011-06-15 22:57:39 +0200 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2011-06-15 22:57:39 +0200 |
| commit | 2bc7c85210d75b7a8a7326284b4f608a16f52ffc (patch) | |
| tree | ca306d89f64ceeee92531cc0a9ba5d246d09f044 /arch/sparc/kernel/viohs.c | |
| parent | gpio/74x164: fix clash with gpiolib namespace (diff) | |
| parent | gpio/tegra: add devicetree support (diff) | |
| download | linux-2bc7c85210d75b7a8a7326284b4f608a16f52ffc.tar.xz linux-2bc7c85210d75b7a8a7326284b4f608a16f52ffc.zip | |
Merge branch 'gpio/next-tegra' into gpio/next
Conflicts:
drivers/gpio/Kconfig
drivers/gpio/Makefile
Diffstat (limited to 'arch/sparc/kernel/viohs.c')
| -rw-r--r-- | arch/sparc/kernel/viohs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sparc/kernel/viohs.c b/arch/sparc/kernel/viohs.c index aa6ac70d4fd5..29348ea139c3 100644 --- a/arch/sparc/kernel/viohs.c +++ b/arch/sparc/kernel/viohs.c @@ -363,7 +363,7 @@ static int process_ver(struct vio_driver_state *vio, struct vio_ver_info *pkt) default: return handshake_failure(vio); - }; + } } static int process_attr(struct vio_driver_state *vio, void *pkt) |