Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 187129
b: refs/heads/master
c: 96534f1
h: refs/heads/master
i:
  187127: 7f4d5e3
v: v3
  • Loading branch information
Joe Perches authored and Linus Torvalds committed Mar 12, 2010
1 parent 415ead6 commit f8e9a72
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: b87c9e0a880f2992dc210eb4ea8b2da6c63883ca
refs/heads/master: 96534f1dd5bf9d324c2d31355cb69565381d1460
2 changes: 1 addition & 1 deletion trunk/drivers/block/floppy.c
Original file line number Diff line number Diff line change
Expand Up @@ -4262,7 +4262,7 @@ static int __init floppy_init(void)
FDCS->dtr = -1;
FDCS->dor = 0x4;
#if defined(__sparc__) || defined(__mc68000__)
/*sparcs/sun3x don't have a DOR reset which we can fall back on to */
/*sparcs/sun3x don't have a DOR reset which we can fall back on to */
#ifdef __mc68000__
if (MACH_IS_SUN3X)
#endif
Expand Down

0 comments on commit f8e9a72

Please sign in to comment.