diff options
| author | David S. Miller <davem@nuts.ninka.net> | 2003-09-04 09:06:15 -0700 |
|---|---|---|
| committer | David S. Miller <davem@nuts.ninka.net> | 2003-09-04 09:06:15 -0700 |
| commit | de5f0c10a5038af9c4b72fbadfa5f695b0aa99d6 (patch) | |
| tree | 9fe351cbf3047eb518a3086da852f00e3d36991b /include/linux | |
| parent | 016b189409b4ae5fbdc75f19de2a2c4bbb4b7377 (diff) | |
| parent | 8697648c34930bb48cfc40785688cd73a3e7269c (diff) | |
Merge nuts.ninka.net:/disk1/davem/BK/network-2.5
into nuts.ninka.net:/disk1/davem/BK/net-2.5
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/kmod.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/kmod.h b/include/linux/kmod.h index 7fa02a737518..8412faeea0f7 100644 --- a/include/linux/kmod.h +++ b/include/linux/kmod.h @@ -29,7 +29,7 @@ extern int request_module(const char * name, ...) __attribute__ ((format (printf static inline int request_module(const char * name, ...) { return -ENOSYS; } #endif -#define try_then_request_module(x, mod...) ((x) ?: request_module(mod), (x)) +#define try_then_request_module(x, mod...) ((x) ?: (request_module(mod), (x))) extern int call_usermodehelper(char *path, char *argv[], char *envp[], int wait); #ifdef CONFIG_HOTPLUG |