diff options
| author |   Jeff Garzik <jeff@garzik.org> | 2006-06-11 23:04:37 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-06-11 23:04:37 -0400 |
| commit | fec69a97489f961026e24536dbb7b86ac663948c (patch) | |
| tree | 869713470d81ebc261598489a2711960336c7c37 /arch/um/os-Linux/main.c | |
| parent | [PATCH] libata: add missing ->data_xfer for pdc_adma (diff) | |
| parent | [PATCH] sata_mv: grab host lock inside eng_timeout (diff) | |
| download | linux-dev-fec69a97489f961026e24536dbb7b86ac663948c.tar.xz linux-dev-fec69a97489f961026e24536dbb7b86ac663948c.zip | |
Merge branch 'upstream-fixes' into upstream
Conflicts:
drivers/scsi/sata_sil24.c
Diffstat (limited to 'arch/um/os-Linux/main.c')
| -rw-r--r-- | arch/um/os-Linux/main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/um/os-Linux/main.c b/arch/um/os-Linux/main.c index 3a0ac38e978b..90912aaca7aa 100644 --- a/arch/um/os-Linux/main.c +++ b/arch/um/os-Linux/main.c @@ -59,7 +59,7 @@ static __init void do_uml_initcalls(void) initcall_t *call; call = &__uml_initcall_start; - while (call < &__uml_initcall_end){; + while (call < &__uml_initcall_end){ (*call)(); call++; } |