From 134d073e01967be28798476945de923e7a4ce3c5 Mon Sep 17 00:00:00 2001 From: Marc Fiuczynski Date: Wed, 15 Sep 2004 17:11:52 +0000 Subject: [PATCH] This commit was generated by cvs2svn to compensate for changes in r146, which included commits to RCS files with non-trunk default branches. --- drivers/pcmcia/pxa2xx_mainstone.c | 2 ++ drivers/pcmcia/soc_common.h | 8 ++++++++ net/bridge/br_sysfs_if.c | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/drivers/pcmcia/pxa2xx_mainstone.c b/drivers/pcmcia/pxa2xx_mainstone.c index af85842ee..fe62a597d 100644 --- a/drivers/pcmcia/pxa2xx_mainstone.c +++ b/drivers/pcmcia/pxa2xx_mainstone.c @@ -24,6 +24,8 @@ #include #include +#include + #include "soc_common.h" diff --git a/drivers/pcmcia/soc_common.h b/drivers/pcmcia/soc_common.h index 60e30197b..f77923ced 100644 --- a/drivers/pcmcia/soc_common.h +++ b/drivers/pcmcia/soc_common.h @@ -10,6 +10,7 @@ #define _ASM_ARCH_PCMCIA /* include the world */ +#include #include #include #include @@ -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 178822116..567249bf9 100644 --- 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) -- 2.47.0