mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-05-06 07:34:03 -04:00
staging/lustre: remove linux/lustre_dlm.h
Remove the superfluous header lustre/include/linux/lustre_dlm.h. Signed-off-by: John L. Hammond <john.hammond@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
committed by
Greg Kroah-Hartman
parent
ec0859da8c
commit
a1805124a5
@@ -1,46 +0,0 @@
|
||||
/*
|
||||
* GPL HEADER START
|
||||
*
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License version 2 only,
|
||||
* as published by the Free Software Foundation.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful, but
|
||||
* WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
* General Public License version 2 for more details (a copy is included
|
||||
* in the LICENSE file that accompanied this code).
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* version 2 along with this program; If not, see
|
||||
* http://www.sun.com/software/products/lustre/docs/GPLv2.pdf
|
||||
*
|
||||
* Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
|
||||
* CA 95054 USA or visit www.sun.com if you need additional information or
|
||||
* have any questions.
|
||||
*
|
||||
* GPL HEADER END
|
||||
*/
|
||||
/*
|
||||
* Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
|
||||
* Use is subject to license terms.
|
||||
*/
|
||||
/*
|
||||
* This file is part of Lustre, http://www.lustre.org/
|
||||
* Lustre is a trademark of Sun Microsystems, Inc.
|
||||
*/
|
||||
|
||||
#ifndef _LINUX_LUSTRE_DLM_H__
|
||||
#define _LINUX_LUSTRE_DLM_H__
|
||||
|
||||
#ifndef _LUSTRE_DLM_H__
|
||||
#error Do not #include this file directly. #include <lprocfs_status.h> instead
|
||||
#endif
|
||||
|
||||
# include <linux/proc_fs.h>
|
||||
# include <asm/processor.h>
|
||||
# include <linux/bit_spinlock.h>
|
||||
|
||||
#endif
|
||||
@@ -48,8 +48,6 @@
|
||||
#ifndef _LUSTRE_DLM_H__
|
||||
#define _LUSTRE_DLM_H__
|
||||
|
||||
#include "linux/lustre_dlm.h"
|
||||
|
||||
#include "lustre_lib.h"
|
||||
#include "lustre_net.h"
|
||||
#include "lustre_import.h"
|
||||
|
||||
Reference in New Issue
Block a user