diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-17 15:00:54 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-17 15:00:54 -0800 |
| commit | 5b8bd54d5d38649a0a61e1146525212e81061971 (patch) | |
| tree | cbe898dccc3cdd13bec413e2ce78ca043cccb106 /drivers/char/xilinx_hwicap/fifo_icap.h | |
| parent | 331c31351044888916805c9cb32d8bb9e40c12e9 (diff) | |
| parent | 4b4cdf3979c32fa3d042d150f49449c74d048553 (diff) | |
| download | op-kernel-dev-5b8bd54d5d38649a0a61e1146525212e81061971.zip op-kernel-dev-5b8bd54d5d38649a0a61e1146525212e81061971.tar.gz | |
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
Diffstat (limited to 'drivers/char/xilinx_hwicap/fifo_icap.h')
| -rw-r--r-- | drivers/char/xilinx_hwicap/fifo_icap.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/char/xilinx_hwicap/fifo_icap.h b/drivers/char/xilinx_hwicap/fifo_icap.h index 62bda45..4c9dd9a 100644 --- a/drivers/char/xilinx_hwicap/fifo_icap.h +++ b/drivers/char/xilinx_hwicap/fifo_icap.h @@ -21,9 +21,6 @@ * INFRINGEMENT, IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS * 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. * All rights reserved. * |
