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

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

diff --git a/drivers/pcmcia/pxa2xx_mainstone.c b/drivers/pcmcia/pxa2xx_mainstone.c
index af85842..fe62a59 100644 (file)
--- a/drivers/pcmcia/pxa2xx_mainstone.c
+++ b/drivers/pcmcia/pxa2xx_mainstone.c
@@ -24,6 +24,8 @@
 #include <asm/hardware.h>
 #include <asm/irq.h>
 
+#include <asm/arch/mainstone.h>
+
 #include "soc_common.h"
 
 

diff --git a/drivers/pcmcia/soc_common.h b/drivers/pcmcia/soc_common.h
index 60e3019..f77923c 100644 (file)
--- a/drivers/pcmcia/soc_common.h
+++ b/drivers/pcmcia/soc_common.h
@@ -10,6 +10,7 @@
 #define _ASM_ARCH_PCMCIA
 
 /* include the world */
+#include <linux/cpufreq.h>
 #include <pcmcia/version.h>
 #include <pcmcia/cs_types.h>
 #include <pcmcia/cs.h>
@@ -103,6 +104,13 @@ struct pcmcia_low_level {
        unsigned int (*get_timing)(struct soc_pcmcia_socket *, unsigned int, unsigned int);
        int (*set_timing)(struct soc_pcmcia_socket *);
        int (*show_timing)(struct soc_pcmcia_socket *, char *);
+
+#ifdef CONFIG_CPU_FREQ
+       /*
+        * CPUFREQ support.
+        */
+       int (*frequency_change)(struct soc_pcmcia_socket *, unsigned long, struct cpufreq_freqs *);
+#endif
 };
 
 

diff --git a/net/bridge/br_sysfs_if.c b/net/bridge/br_sysfs_if.c
index 1788221..567249b 100644 (file)
--- a/net/bridge/br_sysfs_if.c
+++ b/net/bridge/br_sysfs_if.c
@@ -227,7 +227,7 @@ int br_sysfs_addif(struct net_bridge_port *p)
        kobject_set_name(&p->kobj, SYSFS_BRIDGE_PORT_ATTR);
        p->kobj.ktype = &brport_ktype;
        p->kobj.parent = &(p->dev->class_dev.kobj);
-       p->kobj.kset = &bridge_subsys.kset;
+       p->kobj.kset = NULL;
 
        err = kobject_add(&p->kobj);
        if(err)