tmakin/ack-tegra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branches 'tracing/ftrace', 'tracing/textedit' and 'linus' into tracing/core

Browse Source
This commit is contained in:
Ingo Molnar
2009-03-10 22:54:23 +01:00
parent 6cc3c6e12b 7cf4942704 99adcd9d67
commit 4dd163a051
50 changed files with 358 additions and 236 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/linux/cpufreq.h
-1
View File
@@ -234,7 +234,6 @@ struct cpufreq_driver {
int (*suspend) (struct cpufreq_policy *policy, pm_message_t pmsg);
int (*resume) (struct cpufreq_policy *policy);
struct freq_attr **attr;
bool hide_interface;
};
/* flags */
include/linux/netdevice.h
+1
View File
@@ -1079,6 +1079,7 @@ extern void synchronize_net(void);
extern int register_netdevice_notifier(struct notifier_block *nb);
extern int unregister_netdevice_notifier(struct notifier_block *nb);
extern int init_dummy_netdev(struct net_device *dev);
extern void netdev_resync_ops(struct net_device *dev);
extern int call_netdevice_notifiers(unsigned long val, struct net_device *dev);
extern struct net_device *dev_get_by_index(struct net *net, int ifindex);