This commit was generated by cvs2svn to compensate for changes in r149,

which included commits to RCS files with non-trunk default branches.

diff --git a/Documentation/hpet.txt b/Documentation/hpet.txt
index 584ebc2..4e7cc8d 100644 (file)
--- a/Documentation/hpet.txt
+++ b/Documentation/hpet.txt
@@ -103,7 +103,7 @@ hpet_open_close(int argc, const char **argv)
                return;
        }
 
-       fd = open(argv[0], O_RDWR);
+       fd = open(argv[0], O_RDONLY);
        if (fd < 0)
                fprintf(stderr, "hpet_open_close: open failed\n");
        else
@@ -136,7 +136,7 @@ hpet_poll(int argc, const char **argv)
        freq = atoi(argv[1]);
        iterations = atoi(argv[2]);
 
-       fd = open(argv[0], O_RDWR);
+       fd = open(argv[0], O_RDONLY);
 
        if (fd < 0) {
                fprintf(stderr, "hpet_poll: open of %s failed\n", argv[0]);
@@ -230,7 +230,7 @@ hpet_fasync(int argc, const char **argv)
                goto out;
        }
 
-       fd = open(argv[0], O_RDWR);
+       fd = open(argv[0], O_RDONLY);
 
        if (fd < 0) {
                fprintf(stderr, "hpet_fasync: failed to open %s\n", argv[0]);

diff --git a/arch/arm/mach-ixp4xx/coyote-setup.c b/arch/arm/mach-ixp4xx/coyote-setup.c
index bc6e0d0..3d616bc 100644 (file)
--- a/arch/arm/mach-ixp4xx/coyote-setup.c
+++ b/arch/arm/mach-ixp4xx/coyote-setup.c
@@ -84,6 +84,7 @@ MACHINE_START(ADI_COYOTE, "ADI Engineering IXP4XX Coyote Development Platform")
                 IXP4XX_PERIPHERAL_BASE_VIRT)
         MAPIO(coyote_map_io)
         INITIRQ(ixp4xx_init_irq)
+       INITTIME(ixp4xx_init_time)
         BOOT_PARAMS(0x0100)
        INIT_MACHINE(coyote_init)
 MACHINE_END

diff --git a/arch/arm/mach-ixp4xx/ixdp425-setup.c b/arch/arm/mach-ixp4xx/ixdp425-setup.c
index 160117c..ec289c8 100644 (file)
--- a/arch/arm/mach-ixp4xx/ixdp425-setup.c
+++ b/arch/arm/mach-ixp4xx/ixdp425-setup.c
@@ -113,6 +113,7 @@ MACHINE_START(IXDP425, "Intel IXDP425 Development Platform")
                IXP4XX_PERIPHERAL_BASE_VIRT)
        MAPIO(ixdp425_map_io)
        INITIRQ(ixp4xx_init_irq)
+       INITTIME(ixp4xx_init_time)
        BOOT_PARAMS(0x0100)
        INIT_MACHINE(ixdp425_init)
 MACHINE_END
@@ -123,6 +124,7 @@ MACHINE_START(IXCDP1100, "Intel IXCDP1100 Development Platform")
                IXP4XX_PERIPHERAL_BASE_VIRT)
        MAPIO(ixdp425_map_io)
        INITIRQ(ixp4xx_init_irq)
+       INITTIME(ixp4xx_init_time)
        BOOT_PARAMS(0x0100)
        INIT_MACHINE(ixdp425_init)
 MACHINE_END
@@ -140,6 +142,7 @@ MACHINE_START(AVILA, "Gateworks Avila Network Platform")
                IXP4XX_PERIPHERAL_BASE_VIRT)
        MAPIO(ixdp425_map_io)
        INITIRQ(ixp4xx_init_irq)
+       INITTIME(ixp4xx_init_time)
        BOOT_PARAMS(0x0100)
        INIT_MACHINE(ixdp425_init)
 MACHINE_END

diff --git a/arch/arm/mach-versatile/clock.c b/arch/arm/mach-versatile/clock.c
index c1f91fa..a132536 100644 (file)
--- a/arch/arm/mach-versatile/clock.c
+++ b/arch/arm/mach-versatile/clock.c
@@ -97,7 +97,7 @@ int clk_set_rate(struct clk *clk, unsigned long rate)
                ret = 0;
        }
 #endif
-       return 0;
+       return ret;
 }
 EXPORT_SYMBOL(clk_set_rate);
 

diff --git a/arch/ppc/platforms/85xx/Makefile b/arch/ppc/platforms/85xx/Makefile
index 92a8823..e88c515 100644 (file)
--- a/arch/ppc/platforms/85xx/Makefile
+++ b/arch/ppc/platforms/85xx/Makefile
@@ -3,5 +3,7 @@
 #
 
 obj-$(CONFIG_MPC8540_ADS)      += mpc85xx_ads_common.o mpc8540_ads.o
+obj-$(CONFIG_SBC8560)          += sbc85xx.o sbc8560.o
 
 obj-$(CONFIG_MPC8540)          += mpc8540.o
+obj-$(CONFIG_MPC8560)          += mpc8560.o

diff --git a/include/asm-mips/pmon.h b/include/asm-mips/pmon.h
index 0162517..7b4f990 100644 (file)
--- a/include/asm-mips/pmon.h
+++ b/include/asm-mips/pmon.h
@@ -17,6 +17,9 @@ struct callvectors {
        int     (*printf) (const char*, ...);           /*      20 */
        void    (*cacheflush) (void);                   /*      24 */
        char*   (*gets) (char*);                        /*      28 */
+       int     (*cpustart) (int, void *, int, int);    /*      32 */
 };
 
+extern struct callvectors *debug_vectors;
+
 #endif /* _ASM_PMON_H */