Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 39389
b: refs/heads/master
c: 2db5f59
h: refs/heads/master
i:
  39387: 5cb3bac
v: v3
  • Loading branch information
Al Viro authored and Linus Torvalds committed Oct 11, 2006
1 parent fa576b9 commit 1328d39
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 9 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: 2e811488cedddefb9d1df97c260b6048ea8ef835
refs/heads/master: 2db5f59ca74d911f93c39494db1581c3c93d5a29
13 changes: 5 additions & 8 deletions trunk/drivers/block/amiflop.c
Original file line number Diff line number Diff line change
Expand Up @@ -1709,10 +1709,13 @@ static struct kobject *floppy_find(dev_t dev, int *part, void *data)
return get_disk(unit[drive].gendisk);
}

int __init amiga_floppy_init(void)
static int __init amiga_floppy_init(void)
{
int i, ret;

if (!MACH_IS_AMIGA)
return -ENXIO;

if (!AMIGAHW_PRESENT(AMI_FLOPPY))
return -ENXIO;

Expand Down Expand Up @@ -1809,15 +1812,9 @@ int __init amiga_floppy_init(void)
return ret;
}

module_init(amiga_floppy_init);
#ifdef MODULE

int init_module(void)
{
if (!MACH_IS_AMIGA)
return -ENXIO;
return amiga_floppy_init();
}

#if 0 /* not safe to unload */
void cleanup_module(void)
{
Expand Down

0 comments on commit 1328d39

Please sign in to comment.