git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
[pandora-kernel.git]
/
arch
/
sparc
/
include
/
asm
/
floppy_32.h
diff --git
a/arch/sparc/include/asm/floppy_32.h
b/arch/sparc/include/asm/floppy_32.h
index
482c79e
..
7440915
100644
(file)
--- a/
arch/sparc/include/asm/floppy_32.h
+++ b/
arch/sparc/include/asm/floppy_32.h
@@
-138,7
+138,7
@@
static unsigned char sun_82072_fd_inb(int port)
return sun_fdc->data_82072;
case 7: /* FD_DIR */
return sun_read_dir();
return sun_fdc->data_82072;
case 7: /* FD_DIR */
return sun_read_dir();
- }
;
+ }
panic("sun_82072_fd_inb: How did I get here?");
}
panic("sun_82072_fd_inb: How did I get here?");
}
@@
-161,7
+161,7
@@
static void sun_82072_fd_outb(unsigned char value, int port)
case 4: /* FD_STATUS */
sun_fdc->status_82072 = value;
break;
case 4: /* FD_STATUS */
sun_fdc->status_82072 = value;
break;
- }
;
+ }
return;
}
return;
}
@@
-186,7
+186,7
@@
static unsigned char sun_82077_fd_inb(int port)
return sun_fdc->data_82077;
case 7: /* FD_DIR */
return sun_read_dir();
return sun_fdc->data_82077;
case 7: /* FD_DIR */
return sun_read_dir();
- }
;
+ }
panic("sun_82077_fd_inb: How did I get here?");
}
panic("sun_82077_fd_inb: How did I get here?");
}
@@
-212,7
+212,7
@@
static void sun_82077_fd_outb(unsigned char value, int port)
case 3: /* FD_TDR */
sun_fdc->tapectl_82077 = value;
break;
case 3: /* FD_TDR */
sun_fdc->tapectl_82077 = value;
break;
- }
;
+ }
return;
}
return;
}