Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
* 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
This commit is contained in:
Linus Torvalds 2008-12-17 15:00:54 -08:00
commit 5b8bd54d5d
8 changed files with 6 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
drivers/char/xilinx_hwicap/buffer_icap.c
View file

@ -21,9 +21,6 @@
* INFRINGEMENT, IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS * INFRINGEMENT, IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
* FOR A PARTICULAR PURPOSE. * FOR A PARTICULAR PURPOSE.
* *
* Xilinx products are not intended for use in life support appliances,
* devices, or systems. Use in such applications is expressly prohibited.
*
* (c) Copyright 2003-2008 Xilinx Inc. * (c) Copyright 2003-2008 Xilinx Inc.
* All rights reserved. * All rights reserved.
* *

3
drivers/char/xilinx_hwicap/buffer_icap.h
View file

@ -21,9 +21,6 @@
* INFRINGEMENT, IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS * INFRINGEMENT, IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
* FOR A PARTICULAR PURPOSE. * FOR A PARTICULAR PURPOSE.
* *
* Xilinx products are not intended for use in life support appliances,
* devices, or systems. Use in such applications is expressly prohibited.
*
* (c) Copyright 2003-2008 Xilinx Inc. * (c) Copyright 2003-2008 Xilinx Inc.
* All rights reserved. * All rights reserved.
* *

3
drivers/char/xilinx_hwicap/fifo_icap.c
View file

@ -21,9 +21,6 @@
* INFRINGEMENT, IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS * INFRINGEMENT, IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
* FOR A PARTICULAR PURPOSE. * FOR A PARTICULAR PURPOSE.
* *
* Xilinx products are not intended for use in life support appliances,
* devices, or systems. Use in such applications is expressly prohibited.
*
* (c) Copyright 2007-2008 Xilinx Inc. * (c) Copyright 2007-2008 Xilinx Inc.
* All rights reserved. * All rights reserved.
* *

3
drivers/char/xilinx_hwicap/fifo_icap.h
View file

@ -21,9 +21,6 @@
* INFRINGEMENT, IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS * INFRINGEMENT, IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
* FOR A PARTICULAR PURPOSE. * FOR A PARTICULAR PURPOSE.
* *
* Xilinx products are not intended for use in life support appliances,
* devices, or systems. Use in such applications is expressly prohibited.
*
* (c) Copyright 2007-2008 Xilinx Inc. * (c) Copyright 2007-2008 Xilinx Inc.
* All rights reserved. * All rights reserved.
* *

3
drivers/char/xilinx_hwicap/xilinx_hwicap.c
View file

@ -21,9 +21,6 @@
* INFRINGEMENT, IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS * INFRINGEMENT, IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
* FOR A PARTICULAR PURPOSE. * FOR A PARTICULAR PURPOSE.
* *
* Xilinx products are not intended for use in life support appliances,
* devices, or systems. Use in such applications is expressly prohibited.
*
* (c) Copyright 2002 Xilinx Inc., Systems Engineering Group * (c) Copyright 2002 Xilinx Inc., Systems Engineering Group
* (c) Copyright 2004 Xilinx Inc., Systems Engineering Group * (c) Copyright 2004 Xilinx Inc., Systems Engineering Group
* (c) Copyright 2007-2008 Xilinx Inc. * (c) Copyright 2007-2008 Xilinx Inc.

3
drivers/char/xilinx_hwicap/xilinx_hwicap.h
View file

@ -21,9 +21,6 @@
* INFRINGEMENT, IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS * INFRINGEMENT, IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
* FOR A PARTICULAR PURPOSE. * FOR A PARTICULAR PURPOSE.
* *
* Xilinx products are not intended for use in life support appliances,
* devices, or systems. Use in such applications is expressly prohibited.
*
* (c) Copyright 2003-2007 Xilinx Inc. * (c) Copyright 2003-2007 Xilinx Inc.
* All rights reserved. * All rights reserved.
* *

3
drivers/staging/Kconfig
View file

@ -22,6 +22,8 @@ menuconfig STAGING
If in doubt, say N here. If in doubt, say N here.
if STAGING
config STAGING_EXCLUDE_BUILD config STAGING_EXCLUDE_BUILD
bool "Exclude Staging drivers from being built" if STAGING bool "Exclude Staging drivers from being built" if STAGING
default y default y
@ -62,3 +64,4 @@ source "drivers/staging/at76_usb/Kconfig"
source "drivers/staging/poch/Kconfig" source "drivers/staging/poch/Kconfig"
endif # !STAGING_EXCLUDE_BUILD endif # !STAGING_EXCLUDE_BUILD
endif # STAGING

6
lib/dynamic_printk.c
View file

@ -135,7 +135,7 @@ int unregister_dynamic_debug_module(char *mod_name)
nr_entries--; nr_entries--;
out: out:
up(&debug_list_mutex); up(&debug_list_mutex);
return 0; return ret;
} }
EXPORT_SYMBOL_GPL(unregister_dynamic_debug_module); EXPORT_SYMBOL_GPL(unregister_dynamic_debug_module);
@ -289,7 +289,7 @@ static ssize_t pr_debug_write(struct file *file, const char __user *buf,
dynamic_enabled = DYNAMIC_ENABLED_SOME; dynamic_enabled = DYNAMIC_ENABLED_SOME;
err = 0; err = 0;
printk(KERN_DEBUG printk(KERN_DEBUG
"debugging enabled for module %s", "debugging enabled for module %s\n",
elem->name); elem->name);
} else if (!value && (elem->enable == 1)) { } else if (!value && (elem->enable == 1)) {
elem->enable = 0; elem->enable = 0;
@ -309,7 +309,7 @@ static ssize_t pr_debug_write(struct file *file, const char __user *buf,
err = 0; err = 0;
printk(KERN_DEBUG printk(KERN_DEBUG
"debugging disabled for module " "debugging disabled for module "
"%s", elem->name); "%s\n", elem->name);
} }
} }
} }