diff options
| author | Dave Airlie <airlied@redhat.com> | 2010-07-07 18:37:34 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2010-07-07 18:37:34 +1000 |
| commit | 6dbe7465713f0e45f0e867105ca944978d57346e (patch) | |
| tree | 448d7e5f08fa59ca15277d6567825abd74e08e60 /include | |
| parent | 023eb571a1d0eae738326042dcffa974257eb8c8 (diff) | |
| parent | 815c4163b6c8ebf8152f42b0a5fd015cfdcedc78 (diff) | |
Merge tag 'v2.6.35-rc4' into drm-testing
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/dynamic_debug.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/dynamic_debug.h b/include/linux/dynamic_debug.h index b3cd4de9432..52c0da4bdd1 100644 --- a/include/linux/dynamic_debug.h +++ b/include/linux/dynamic_debug.h @@ -40,7 +40,7 @@ int ddebug_add_module(struct _ddebug *tab, unsigned int n, const char *modname); #if defined(CONFIG_DYNAMIC_DEBUG) -extern int ddebug_remove_module(char *mod_name); +extern int ddebug_remove_module(const char *mod_name); #define __dynamic_dbg_enabled(dd) ({ \ int __ret = 0; \ @@ -73,7 +73,7 @@ extern int ddebug_remove_module(char *mod_name); #else -static inline int ddebug_remove_module(char *mod) +static inline int ddebug_remove_module(const char *mod) { return 0; } |