diff options
| author | Patrick McHardy <kaber@trash.net> | 2011-06-16 17:01:10 +0200 |
|---|---|---|
| committer | Patrick McHardy <kaber@trash.net> | 2011-06-16 17:01:10 +0200 |
| commit | 1f2d9c9dd8276b1c19ef80e6d8059fe47506d4c3 (patch) | |
| tree | c5a3439c1c140eb87f7e3ece2e1148dece037b4f /include/linux/sysdev.h | |
| parent | a7fed7620b6eeaba98a558df46bb50a31828b462 (diff) | |
| parent | 520b2756d9414cb6b0f6fc70714e95ee9248ebf4 (diff) | |
| download | cachepc-linux-1f2d9c9dd8276b1c19ef80e6d8059fe47506d4c3.tar.gz cachepc-linux-1f2d9c9dd8276b1c19ef80e6d8059fe47506d4c3.zip | |
Merge branch 'master' of /repos/git/net-next-2.6
Diffstat (limited to 'include/linux/sysdev.h')
| -rw-r--r-- | include/linux/sysdev.h | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/include/linux/sysdev.h b/include/linux/sysdev.h index dfb078db8ebb..d35e783a598c 100644 --- a/include/linux/sysdev.h +++ b/include/linux/sysdev.h @@ -34,12 +34,6 @@ struct sysdev_class { struct list_head drivers; struct sysdev_class_attribute **attrs; struct kset kset; -#ifndef CONFIG_ARCH_NO_SYSDEV_OPS - /* Default operations for these types of devices */ - int (*shutdown)(struct sys_device *); - int (*suspend)(struct sys_device *, pm_message_t state); - int (*resume)(struct sys_device *); -#endif }; struct sysdev_class_attribute { @@ -77,11 +71,6 @@ struct sysdev_driver { struct list_head entry; int (*add)(struct sys_device *); int (*remove)(struct sys_device *); -#ifndef CONFIG_ARCH_NO_SYSDEV_OPS - int (*shutdown)(struct sys_device *); - int (*suspend)(struct sys_device *, pm_message_t state); - int (*resume)(struct sys_device *); -#endif }; |