From: Greg Kroah-Hartman Date: Thu, 26 Feb 2009 02:11:24 +0000 (-0800) Subject: Staging: slicoss: remove slic_os.h X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=f95739b1bf2ad004c176109dfe2f555f1f099d6c;p=linux-beck.git Staging: slicoss: remove slic_os.h It's no longer needed, and empty, so remove it. Cc: Lior Dotan Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/slicoss/slic_os.h b/drivers/staging/slicoss/slic_os.h deleted file mode 100644 index 69d8f2008931..000000000000 --- a/drivers/staging/slicoss/slic_os.h +++ /dev/null @@ -1,46 +0,0 @@ -/************************************************************************** - * - * Copyright (c)2000-2002 Alacritech, Inc. All rights reserved. - * - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above - * copyright notice, this list of conditions and the following - * disclaimer in the documentation and/or other materials provided - * with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY ALACRITECH, INC. ``AS IS'' AND ANY - * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL ALACRITECH, INC. OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * The views and conclusions contained in the software and documentation - * are those of the authors and should not be interpreted as representing - * official policies, either expressed or implied, of Alacritech, Inc. - * - **************************************************************************/ - -/* - * FILENAME: slic_os.h - * - * These are the Linux-specific definitions required for the SLICOSS - * driver, which should allow for greater portability to other OSes. - */ -#ifndef _SLIC_OS_SPECIFIC_H_ -#define _SLIC_OS_SPECIFIC_H_ - -#endif /* _SLIC_OS_SPECIFIC_H_ */ - diff --git a/drivers/staging/slicoss/slicinc.h b/drivers/staging/slicoss/slicinc.h index 205dfa4cc713..2c70d63fa5b6 100644 --- a/drivers/staging/slicoss/slicinc.h +++ b/drivers/staging/slicoss/slicinc.h @@ -42,7 +42,6 @@ #ifndef _SLIC_INCLUDE_H_ #define _SLIC_INCLUDE_H_ -#include "slic_os.h" #include "slicdbg.h" #include "slichw.h" #include "slic.h"