diff options
| author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
|---|---|---|
| committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
| commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
| tree | 644b88f8a71896307d71438e9b3af49126ffb22b /arch/sparc/prom/devmap.c | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'arch/sparc/prom/devmap.c')
| -rw-r--r-- | arch/sparc/prom/devmap.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/sparc/prom/devmap.c b/arch/sparc/prom/devmap.c index 1e517915b0df..46157d2aba0d 100644 --- a/arch/sparc/prom/devmap.c +++ b/arch/sparc/prom/devmap.c | |||
| @@ -50,5 +50,4 @@ prom_unmapio(char *vaddr, unsigned int num_bytes) | |||
| 50 | (*(romvec->pv_v2devops.v2_dumb_munmap))(vaddr, num_bytes); | 50 | (*(romvec->pv_v2devops.v2_dumb_munmap))(vaddr, num_bytes); |
| 51 | restore_current(); | 51 | restore_current(); |
| 52 | spin_unlock_irqrestore(&prom_lock, flags); | 52 | spin_unlock_irqrestore(&prom_lock, flags); |
| 53 | return; | ||
| 54 | } | 53 | } |