diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-07-11 23:15:15 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-07-11 23:15:15 -0700 |
| commit | d2bc118d0ba566c23700dc3b5e616ffc2bedad72 (patch) | |
| tree | 3dbde512e6e393448418755c1c7e7d8afc220cbd /drivers/staging/lustre/include | |
| parent | 13636be4b6a6b036aaf3d9f2c8094e62d56d5cff (diff) | |
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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/lustre/include')
| -rw-r--r-- | drivers/staging/lustre/include/linux/libcfs/linux/libcfs.h | 2 | ||||
| -rw-r--r-- | drivers/staging/lustre/include/linux/libcfs/linux/linux-bitops.h | 38 |
2 files changed, 1 insertions, 39 deletions
diff --git a/drivers/staging/lustre/include/linux/libcfs/linux/libcfs.h b/drivers/staging/lustre/include/linux/libcfs/linux/libcfs.h index bc7c8a7f0f0f..d647389e3ed9 100644 --- a/drivers/staging/lustre/include/linux/libcfs/linux/libcfs.h +++ b/drivers/staging/lustre/include/linux/libcfs/linux/libcfs.h @@ -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" diff --git a/drivers/staging/lustre/include/linux/libcfs/linux/linux-bitops.h b/drivers/staging/lustre/include/linux/libcfs/linux/linux-bitops.h deleted file mode 100644 index 43936e349dd4..000000000000 --- a/drivers/staging/lustre/include/linux/libcfs/linux/linux-bitops.h +++ /dev/null @@ -1,38 +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) 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> |