diff options
author | 2011-04-13 13:32:28 +0200 | |
---|---|---|
committer | 2011-04-13 13:32:28 +0200 | |
commit | b32e3dc7860d00124fa432dba09667e647cb9bcc (patch) | |
tree | 2fa6e56f389431dfb84609d3d7572cad76e88e71 /include/linux/device.h | |
parent | netfilter: ipset: References are protected by rwlock instead of mutex (diff) | |
parent | netfilter: xt_conntrack: fix inverted conntrack direction test (diff) | |
download | wireguard-linux-b32e3dc7860d00124fa432dba09667e647cb9bcc.tar.xz wireguard-linux-b32e3dc7860d00124fa432dba09667e647cb9bcc.zip |
Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6
Diffstat (limited to 'include/linux/device.h')
-rw-r--r-- | include/linux/device.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/device.h b/include/linux/device.h index 144ec135875f..ab8dfc095709 100644 --- a/include/linux/device.h +++ b/include/linux/device.h @@ -633,8 +633,12 @@ static inline int devtmpfs_mount(const char *mountpoint) { return 0; } /* drivers/base/power/shutdown.c */ extern void device_shutdown(void); +#ifndef CONFIG_ARCH_NO_SYSDEV_OPS /* drivers/base/sys.c */ extern void sysdev_shutdown(void); +#else +static inline void sysdev_shutdown(void) { } +#endif /* debugging and troubleshooting/diagnostic helpers. */ extern const char *dev_driver_string(const struct device *dev); |