mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 10:41:38 -04:00
Merge branch 'linus' into core/percpu
Conflicts: arch/x86/kernel/setup_percpu.c
This commit is contained in:
commit
3ddeb51d9c
944 changed files with 12533 additions and 5854 deletions
|
|
@ -777,10 +777,16 @@ static void device_remove_class_symlinks(struct device *dev)
|
|||
int dev_set_name(struct device *dev, const char *fmt, ...)
|
||||
{
|
||||
va_list vargs;
|
||||
char *s;
|
||||
|
||||
va_start(vargs, fmt);
|
||||
vsnprintf(dev->bus_id, sizeof(dev->bus_id), fmt, vargs);
|
||||
va_end(vargs);
|
||||
|
||||
/* ewww... some of these buggers have / in the name... */
|
||||
while ((s = strchr(dev->bus_id, '/')))
|
||||
*s = '!';
|
||||
|
||||
return 0;
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(dev_set_name);
|
||||
|
|
|
|||
Loading…
Reference in a new issue