Commit d2bc118d authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

staging: lustre: remove include/libcfs/linux/linux-bitops.h 



It was just includeing bitops.h so do that instead in the one place that
was calling it.

Cc: Andreas Dilger <andreas.dilger@intel.com>
Cc: Oleg Drokin <oleg.drokin@intel.com>
Cc: hpdd-discuss <hpdd-discuss@lists.01.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 13636be4

drivers/staging/lustre/include/linux/libcfs/linux/libcfs.h

+1 −1
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ 
#endif





#include <linux/bitops.h>

#include <stdarg.h>

#include "linux-cpu.h"

#include "linux-time.h"
@@ -49,7 +50,6 @@ 
#include "linux-prim.h"

#include "linux-lock.h"

#include "linux-tcpip.h"

#include "linux-bitops.h"

#include "linux-types.h"

#include "kp30.h"

drivers/staging/lustre/include/linux/libcfs/linux/linux-bitops.h

deleted100644 → 0
+0 −38
Original line number Diff line number Diff line 
/*

 * 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) 2010, Oracle and/or its affiliates. All rights reserved.

 * Use is subject to license terms.

 *

 * Copyright (c) 2012, Intel Corporation.

 */

/*

 * This file is part of Lustre, http://www.lustre.org/

 * Lustre is a trademark of Sun Microsystems, Inc.

 *

 * libcfs/include/libcfs/linux/linux-bitops.h

 */

#include <linux/bitops.h>