LU-812 kernel: AUTOCONF_INCLUDED removed

[fs/lustre-release.git] / lustre / include / linux / obd_support.h

diff --git a/lustre/include/linux/obd_support.h b/lustre/include/linux/obd_support.h
index 2e21b08..4fdb4e5 100644 (file)
--- a/lustre/include/linux/obd_support.h
+++ b/lustre/include/linux/obd_support.h
@@ -1,6 +1,4 @@
-/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
- * vim:expandtab:shiftwidth=8:tabstop=8:
- *
+/*
  * GPL HEADER START
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -26,8 +24,10 @@
  * GPL HEADER END
  */
 /*
- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
+ *
+ * Copyright (c) 2011, Whamcloud, Inc.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -42,12 +42,10 @@
 #endif
 
 #ifdef __KERNEL__
-#ifndef AUTOCONF_INCLUDED
-#include <linux/config.h>
-#endif
+#include <asm/cpufeature.h>
+#include <asm/processor.h>
 #include <linux/seq_file.h>
 #include <linux/module.h>
-#include <linux/autoconf.h>
 #include <linux/slab.h>
 #include <linux/highmem.h>
 #include <linux/swap.h>
@@ -61,7 +59,6 @@
 # include <linux/types.h>
 # include <linux/blkdev.h>
 # include <lvfs.h>
-# define OBD_SLEEP_ON(wq, state)  wait_event_interruptible(wq, state)
 #else /* !__KERNEL__ */
 # define LTIME_S(time) (time)
 /* for obd_class.h */