From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751807AbbIOXGs (ORCPT ); Tue, 15 Sep 2015 19:06:48 -0400 Received: from smtp.codeaurora.org ([198.145.29.96]:40728 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751465AbbIOXGr (ORCPT ); Tue, 15 Sep 2015 19:06:47 -0400 From: Stephen Boyd To: Steven Miao Cc: linux-kernel@vger.kernel.org, linux-clk@vger.kernel.org, adi-buildroot-devel@lists.sourceforge.net, Michael Turquette Subject: [PATCH] blackfin: Use generic clkdev.h header Date: Tue, 15 Sep 2015 16:06:44 -0700 Message-Id: <1442358404-2717-1-git-send-email-sboyd@codeaurora.org> X-Mailer: git-send-email 2.3.0.rc1.33.g42e4583 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The blackfin clkdev.h header is the same as the asm-generic header, so just use the asm-generic one. Signed-off-by: Stephen Boyd --- arch/blackfin/include/asm/Kbuild | 1 + arch/blackfin/include/asm/clkdev.h | 16 ---------------- 2 files changed, 1 insertion(+), 16 deletions(-) delete mode 100644 arch/blackfin/include/asm/clkdev.h diff --git a/arch/blackfin/include/asm/Kbuild b/arch/blackfin/include/asm/Kbuild index 61cd1e786a14..a391f08e5565 100644 --- a/arch/blackfin/include/asm/Kbuild +++ b/arch/blackfin/include/asm/Kbuild @@ -2,6 +2,7 @@ generic-y += auxvec.h generic-y += bitsperlong.h generic-y += bugs.h +generic-y += clkdev.h generic-y += cputime.h generic-y += current.h generic-y += device.h diff --git a/arch/blackfin/include/asm/clkdev.h b/arch/blackfin/include/asm/clkdev.h deleted file mode 100644 index 7ac2436856a5..000000000000 --- a/arch/blackfin/include/asm/clkdev.h +++ /dev/null @@ -1,16 +0,0 @@ -#ifndef __ASM_CLKDEV__H_ -#define __ASM_CLKDEV__H_ - -#include - -static inline struct clk_lookup_alloc *__clkdev_alloc(size_t size) -{ - return kzalloc(size, GFP_KERNEL); -} - -#ifndef CONFIG_COMMON_CLK -#define __clk_put(clk) -#define __clk_get(clk) ({ 1; }) -#endif - -#endif -- The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project