diff options
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/arm_boot.c | 2 | ||||
| -rw-r--r-- | hw/omap_clk.c | 17 |
2 files changed, 1 insertions, 18 deletions
diff --git a/hw/arm_boot.c b/hw/arm_boot.c index cf9616ae0b..fe17ffc74e 100644 --- a/hw/arm_boot.c +++ b/hw/arm_boot.c @@ -107,7 +107,7 @@ static void set_kernel_args_old(struct arm_boot_info *info, int initrd_size, void *base) { uint32_t *p; - unsigned char *s; + char *s; /* see linux/include/asm-arm/setup.h */ p = (uint32_t *)(base + KERNEL_ARGS_ADDR); diff --git a/hw/omap_clk.c b/hw/omap_clk.c index 38b098e56a..d7a5a577d4 100644 --- a/hw/omap_clk.c +++ b/hw/omap_clk.c @@ -1098,23 +1098,6 @@ void omap_clk_adduser(struct clk *clk, qemu_irq user) *i = user; } -/* If a clock is allowed to idle, it is disabled automatically when - * all of clock domains using it are disabled. */ -static int omap_clk_is_idle(struct clk *clk) -{ - struct clk *chld; - - if (!clk->enabled && (!clk->usecount || !(clk->flags && ALWAYS_ENABLED))) - return 1; - if (clk->usecount) - return 0; - - for (chld = clk->child1; chld; chld = chld->sibling) - if (!omap_clk_is_idle(chld)) - return 0; - return 1; -} - struct clk *omap_findclk(struct omap_mpu_state_s *mpu, const char *name) { struct clk *i; |