diff options
| author | Dr. David Alan Gilbert <dgilbert@redhat.com> | 2014-10-24 12:19:12 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2014-10-24 12:19:12 +0100 |
| commit | 635117e71fc697824e82cc694ba4e44dda7a9216 (patch) | |
| tree | 84a9ec221c283ef1a612b184f4960c1e22e90196 /hw/misc | |
| parent | 94cc44a9e51eabd67282b1691f882c31436df2c4 (diff) | |
| download | qemu-635117e71fc697824e82cc694ba4e44dda7a9216.zip qemu-635117e71fc697824e82cc694ba4e44dda7a9216.tar.gz qemu-635117e71fc697824e82cc694ba4e44dda7a9216.tar.bz2 | |
omap_gpmc.c: Remove duplicate assignment
This looks like an old merge error and should have no effect.
(Build tested only)
Found by Coccinelle using Julia Lawall's script:
https://lkml.org/lkml/2014/8/23/128
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Message-id: 1414055855-6688-1-git-send-email-dgilbert@redhat.com
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/misc')
| -rw-r--r-- | hw/misc/omap_gpmc.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/hw/misc/omap_gpmc.c b/hw/misc/omap_gpmc.c index fbbe2ff..a0de52f 100644 --- a/hw/misc/omap_gpmc.c +++ b/hw/misc/omap_gpmc.c @@ -466,8 +466,6 @@ void omap_gpmc_reset(struct omap_gpmc_s *s) s->cs_file[i].config[3] = 0x10031003; s->cs_file[i].config[4] = 0x10f1111; s->cs_file[i].config[5] = 0; - s->cs_file[i].config[6] = 0xf00 | (i ? 0 : 1 << 6); - s->cs_file[i].config[6] = 0xf00; /* In theory we could probe attached devices for some CFG1 * bits here, but we just retain them across resets as they |