diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-08-20 05:18:17 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-08-20 05:18:17 +1000 |
| commit | 62f63d47ff1ffde07c1a021b3c46daee8280a5fa (patch) | |
| tree | 9ed2df042c22074ff1f35aa777b05f5034265057 /include/linux/kernel.h | |
| parent | f2cf29319ec17dd64e2477a9ae5464d1e6c641c0 (diff) | |
| parent | ef50518e96a5d97e6ef58527728c0b858df87726 (diff) | |
Merge branch 'akpm/master'
Diffstat (limited to 'include/linux/kernel.h')
| -rw-r--r-- | include/linux/kernel.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/include/linux/kernel.h b/include/linux/kernel.h index aa2a0cb57f50..058880200678 100644 --- a/include/linux/kernel.h +++ b/include/linux/kernel.h @@ -376,10 +376,6 @@ extern unsigned long simple_strtoul(const char *,char **,unsigned int); extern long simple_strtol(const char *,char **,unsigned int); extern unsigned long long simple_strtoull(const char *,char **,unsigned int); extern long long simple_strtoll(const char *,char **,unsigned int); -#define strict_strtoul kstrtoul -#define strict_strtol kstrtol -#define strict_strtoull kstrtoull -#define strict_strtoll kstrtoll extern int num_to_str(char *buf, int size, unsigned long long num); |