From 7eb92135c61af77fff62eec5f396b9633a54b245 Mon Sep 17 00:00:00 2001 From: Greg KH Date: Tue, 26 Apr 2005 23:48:29 -0700 Subject: more merge fixups, looks like i missed a selinux patch somewhere... --- udev_selinux.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'udev_selinux.h') diff --git a/udev_selinux.h b/udev_selinux.h index d9dfeffad0..132a9a6550 100644 --- a/udev_selinux.h +++ b/udev_selinux.h @@ -24,17 +24,15 @@ extern void selinux_setfilecon(const char *file, const char *devname, unsigned int mode); extern void selinux_setfscreatecon(const char *file, const char *devname, unsigned int mode); -extern void selinux_resetfscreatecon(void); extern void selinux_init(void); -extern void selinux_exit(void); +extern void selinux_restore(void); #else static inline void selinux_setfilecon(const char *file, const char *devname, unsigned int mode) {} static inline void selinux_setfscreatecon(const char *file, const char *devname, unsigned int mode) {} -static inline void selinux_resetfscreatecon(void) {} static inline void selinux_init(void) {} -static inline void selinux_exit(void) {} +static inline void selinux_restore(void) {} #endif /* USE_SELINUX */ #endif /* _UDEV_USE_SELINUX */ -- cgit v1.2.3-54-g00ecf