From c3914d2be2ea61daa9a670ae8e18b2bac6a6647b Mon Sep 17 00:00:00 2001
From: Elliott Hughes <enh@google.com>
Date: Mon, 17 Nov 2014 14:38:56 -0800
Subject: Remove atomic-inline.h.

Change-Id: I3ac0229b9c516744e6a9c9d9e795b43bc9c5636b
---
 include/cutils/aref.h          |  2 +-
 include/cutils/atomic-inline.h | 19 -------------------
 include/cutils/trace.h         |  2 +-
 3 files changed, 2 insertions(+), 21 deletions(-)
 delete mode 100644 include/cutils/atomic-inline.h

diff --git a/include/cutils/aref.h b/include/cutils/aref.h
index e40dc70..3bd36ea 100644
--- a/include/cutils/aref.h
+++ b/include/cutils/aref.h
@@ -20,7 +20,7 @@
 #include <stddef.h>
 #include <sys/cdefs.h>
 
-#include <cutils/atomic-inline.h>
+#include <cutils/atomic.h>
 
 __BEGIN_DECLS
 
diff --git a/include/cutils/atomic-inline.h b/include/cutils/atomic-inline.h
deleted file mode 100644
index 103c5b0..0000000
--- a/include/cutils/atomic-inline.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Copyright (C) 2014 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef ANDROID_CUTILS_ATOMIC_H
-#include <cutils/atomic.h>
-#endif
diff --git a/include/cutils/trace.h b/include/cutils/trace.h
index 6ca8293..59ff6c1 100644
--- a/include/cutils/trace.h
+++ b/include/cutils/trace.h
@@ -25,8 +25,8 @@
 #include <sys/types.h>
 #include <unistd.h>
 
+#include <cutils/atomic.h>
 #include <cutils/compiler.h>
-#include <cutils/atomic-inline.h>
 
 __BEGIN_DECLS
 
-- 
cgit v1.1