Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 5b8bd54d5d38649a0a61e1146525212e81061971

Authored by Linus Torvalds
2 parents 331c313510 4b4cdf3979

Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6 

* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6:
  STAGING: Move staging drivers back to staging-specific menu
  driver core: add newlines to debugging enabled/disabled messages
  xilinx_hwicap: remove improper wording in license statement
  driver core: fix using 'ret' variable in unregister_dynamic_debug_module

Showing 8 changed files Side-by-side Diff

drivers/char/xilinx_hwicap/buffer_icap.c
Diff comments   View file @ 5b8bd54
... ... @@ -21,9 +21,6 @@
21 21 * INFRINGEMENT, IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
22 22 * FOR A PARTICULAR PURPOSE.
23 23 *
24   - * Xilinx products are not intended for use in life support appliances,
25   - * devices, or systems. Use in such applications is expressly prohibited.
26   - *
27 24 * (c) Copyright 2003-2008 Xilinx Inc.
28 25 * All rights reserved.
29 26 *
drivers/char/xilinx_hwicap/buffer_icap.h
Diff comments   View file @ 5b8bd54
... ... @@ -21,9 +21,6 @@
21 21 * INFRINGEMENT, IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
22 22 * FOR A PARTICULAR PURPOSE.
23 23 *
24   - * Xilinx products are not intended for use in life support appliances,
25   - * devices, or systems. Use in such applications is expressly prohibited.
26   - *
27 24 * (c) Copyright 2003-2008 Xilinx Inc.
28 25 * All rights reserved.
29 26 *
drivers/char/xilinx_hwicap/fifo_icap.c
Diff comments   View file @ 5b8bd54
... ... @@ -21,9 +21,6 @@
21 21 * INFRINGEMENT, IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
22 22 * FOR A PARTICULAR PURPOSE.
23 23 *
24   - * Xilinx products are not intended for use in life support appliances,
25   - * devices, or systems. Use in such applications is expressly prohibited.
26   - *
27 24 * (c) Copyright 2007-2008 Xilinx Inc.
28 25 * All rights reserved.
29 26 *
drivers/char/xilinx_hwicap/fifo_icap.h
Diff comments   View file @ 5b8bd54
... ... @@ -21,9 +21,6 @@
21 21 * INFRINGEMENT, IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
22 22 * FOR A PARTICULAR PURPOSE.
23 23 *
24   - * Xilinx products are not intended for use in life support appliances,
25   - * devices, or systems. Use in such applications is expressly prohibited.
26   - *
27 24 * (c) Copyright 2007-2008 Xilinx Inc.
28 25 * All rights reserved.
29 26 *
drivers/char/xilinx_hwicap/xilinx_hwicap.c
Diff comments   View file @ 5b8bd54
... ... @@ -21,9 +21,6 @@
21 21 * INFRINGEMENT, IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
22 22 * FOR A PARTICULAR PURPOSE.
23 23 *
24   - * Xilinx products are not intended for use in life support appliances,
25   - * devices, or systems. Use in such applications is expressly prohibited.
26   - *
27 24 * (c) Copyright 2002 Xilinx Inc., Systems Engineering Group
28 25 * (c) Copyright 2004 Xilinx Inc., Systems Engineering Group
29 26 * (c) Copyright 2007-2008 Xilinx Inc.
drivers/char/xilinx_hwicap/xilinx_hwicap.h
Diff comments   View file @ 5b8bd54
... ... @@ -21,9 +21,6 @@
21 21 * INFRINGEMENT, IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
22 22 * FOR A PARTICULAR PURPOSE.
23 23 *
24   - * Xilinx products are not intended for use in life support appliances,
25   - * devices, or systems. Use in such applications is expressly prohibited.
26   - *
27 24 * (c) Copyright 2003-2007 Xilinx Inc.
28 25 * All rights reserved.
29 26 *
drivers/staging/Kconfig
Diff comments   View file @ 5b8bd54
... ... @@ -22,6 +22,8 @@
22 22 If in doubt, say N here.
23 23  
24 24  
  25 +if STAGING
  26 +
25 27 config STAGING_EXCLUDE_BUILD
26 28 bool "Exclude Staging drivers from being built" if STAGING
27 29 default y
... ... @@ -62,4 +64,5 @@
62 64 source "drivers/staging/poch/Kconfig"
63 65  
64 66 endif # !STAGING_EXCLUDE_BUILD
  67 +endif # STAGING
lib/dynamic_printk.c
Diff comments   View file @ 5b8bd54
... ... @@ -135,7 +135,7 @@
135 135 nr_entries--;
136 136 out:
137 137 up(&debug_list_mutex);
138   - return 0;
  138 + return ret;
139 139 }
140 140 EXPORT_SYMBOL_GPL(unregister_dynamic_debug_module);
141 141  
... ... @@ -289,7 +289,7 @@
289 289 dynamic_enabled = DYNAMIC_ENABLED_SOME;
290 290 err = 0;
291 291 printk(KERN_DEBUG
292   - "debugging enabled for module %s",
  292 + "debugging enabled for module %s\n",
293 293 elem->name);
294 294 } else if (!value && (elem->enable == 1)) {
295 295 elem->enable = 0;
... ... @@ -309,7 +309,7 @@
309 309 err = 0;
310 310 printk(KERN_DEBUG
311 311 "debugging disabled for module "
312   - "%s", elem->name);
  312 + "%s\n", elem->name);
313 313 }
314 314 }
315 315 }