mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-25 06:03:36 -04:00
Merge tag 'v2.6.35-rc4' into drm-testing
This commit is contained in:
commit
6dbe746571
49 changed files with 511 additions and 599 deletions
|
|
@ -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;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue