From patchwork Thu Feb 9 22:24:33 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 6746 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 51B7823E01 for ; Thu, 9 Feb 2012 22:26:14 +0000 (UTC) Received: from mail-iy0-f180.google.com (mail-iy0-f180.google.com [209.85.210.180]) by fiordland.canonical.com (Postfix) with ESMTP id 1ADEAA18683 for ; Thu, 9 Feb 2012 22:26:13 +0000 (UTC) Received: by mail-iy0-f180.google.com with SMTP id z7so4255939iab.11 for ; Thu, 09 Feb 2012 14:26:13 -0800 (PST) Received: by 10.42.57.148 with SMTP id d20mr5475005ich.33.1328826373863; Thu, 09 Feb 2012 14:26:13 -0800 (PST) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.231.12.131 with SMTP id x3cs56369ibx; Thu, 9 Feb 2012 14:26:13 -0800 (PST) Received: by 10.236.123.101 with SMTP id u65mr5504632yhh.34.1328826372987; Thu, 09 Feb 2012 14:26:12 -0800 (PST) Received: from e4.ny.us.ibm.com (e4.ny.us.ibm.com. [32.97.182.144]) by mx.google.com with ESMTPS id n11si2009217ani.150.2012.02.09.14.26.12 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 09 Feb 2012 14:26:12 -0800 (PST) Received-SPF: pass (google.com: domain of jstultz@us.ibm.com designates 32.97.182.144 as permitted sender) client-ip=32.97.182.144; Authentication-Results: mx.google.com; spf=pass (google.com: domain of jstultz@us.ibm.com designates 32.97.182.144 as permitted sender) smtp.mail=jstultz@us.ibm.com Received: from /spool/local by e4.ny.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 9 Feb 2012 17:26:11 -0500 Received: from d01dlp02.pok.ibm.com (9.56.224.85) by e4.ny.us.ibm.com (192.168.1.104) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Thu, 9 Feb 2012 17:24:51 -0500 Received: from d01relay04.pok.ibm.com (d01relay04.pok.ibm.com [9.56.227.236]) by d01dlp02.pok.ibm.com (Postfix) with ESMTP id 644626E804B; Thu, 9 Feb 2012 17:24:50 -0500 (EST) Received: from d03av04.boulder.ibm.com (d03av04.boulder.ibm.com [9.17.195.170]) by d01relay04.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id q19MOnqS345960; Thu, 9 Feb 2012 17:24:50 -0500 Received: from d03av04.boulder.ibm.com (loopback [127.0.0.1]) by d03av04.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id q19MOn9G018664; Thu, 9 Feb 2012 15:24:49 -0700 Received: from kernel.beaverton.ibm.com (kernel.beaverton.ibm.com [9.47.67.96]) by d03av04.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id q19MOmVX018629; Thu, 9 Feb 2012 15:24:49 -0700 Received: by kernel.beaverton.ibm.com (Postfix, from userid 1056) id 0B62CBFEC4; Thu, 9 Feb 2012 14:24:48 -0800 (PST) From: John Stultz To: Greg KH Cc: John Stultz , =?UTF-8?q?Arve=20Hj=C3=B8nnev=C3=A5g?= , Greg KH , Android Kernel Team Subject: [PATCH 04/12] android-alarm: Fix include compile issues Date: Thu, 9 Feb 2012 14:24:33 -0800 Message-Id: <1328826281-27148-5-git-send-email-john.stultz@linaro.org> X-Mailer: git-send-email 1.7.3.2.146.gca209 In-Reply-To: <1328826281-27148-1-git-send-email-john.stultz@linaro.org> References: <1328826281-27148-1-git-send-email-john.stultz@linaro.org> MIME-Version: 1.0 X-Content-Scanned: Fidelis XPS MAILER x-cbid: 12020922-3534-0000-0000-00000569F3CE X-Gm-Message-State: ALoCoQlbrOSfRe9bygWaID3W+ICl6uagOm1Dw/uHcOccbVZpDczYejuGba/ydEA8rGOfIve2Hz3E The file asm/mach/time.h doesn't exist on all arches, so include . Also linux/sysdev.h is gone so kill it. CC: Arve Hjønnevåg CC: Greg KH CC: Android Kernel Team Signed-off-by: John Stultz --- drivers/staging/android/alarm-dev.c | 3 +-- drivers/staging/android/alarm.c | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/staging/android/alarm-dev.c b/drivers/staging/android/alarm-dev.c index 7391f40..80ea850 100644 --- a/drivers/staging/android/alarm-dev.c +++ b/drivers/staging/android/alarm-dev.c @@ -13,7 +13,7 @@ * */ -#include +#include #include #include #include @@ -21,7 +21,6 @@ #include #include #include -#include #include #include #include "android_alarm.h" diff --git a/drivers/staging/android/alarm.c b/drivers/staging/android/alarm.c index c16032b..7aaf5b8 100644 --- a/drivers/staging/android/alarm.c +++ b/drivers/staging/android/alarm.c @@ -13,7 +13,7 @@ * */ -#include +#include #include #include #include @@ -21,7 +21,6 @@ #include #include #include -#include #include #include "android_alarm.h"