summaryrefslogtreecommitdiff
path: root/drivers/clk
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2013-06-28 14:59:02 +0400
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2013-06-28 14:59:02 +0400
commitf4c9f402389977dc852ef4848c7615926306735d (patch)
treecf0c6c7e7f1dbbb1790443ab22f8a102c0428fd5 /drivers/clk
parent3b4550e0e0cd24d8073dc571cecb0d4aa4ca3542 (diff)
parent958c4eb2aa325099ea1f54c7354e381e3d79f3ae (diff)
downloadlinux-f4c9f402389977dc852ef4848c7615926306735d.tar.xz
Merge branch 'acpi-lpss'
* acpi-lpss: ACPI / LPSS: override SDIO private register space size from ACPI tables ACPI / LPSS: mask the UART TX completion interrupt ACPI / LPSS: add support for Intel BayTrail Conflicts: drivers/acpi/acpi_lpss.c (with commit b9e95fc)
Diffstat (limited to 'drivers/clk')
-rw-r--r--drivers/clk/x86/clk-lpt.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/clk/x86/clk-lpt.c b/drivers/clk/x86/clk-lpt.c
index 4f45eee9e33b..812f83f8b0c6 100644
--- a/drivers/clk/x86/clk-lpt.c
+++ b/drivers/clk/x86/clk-lpt.c
@@ -1,5 +1,5 @@
/*
- * Intel Lynxpoint LPSS clocks.
+ * Intel Low Power Subsystem clocks.
*
* Copyright (C) 2013, Intel Corporation
* Authors: Mika Westerberg <mika.westerberg@linux.intel.com>
@@ -18,8 +18,6 @@
#include <linux/platform_data/clk-lpss.h>
#include <linux/platform_device.h>
-#define PRV_CLOCK_PARAMS 0x800
-
static int lpt_clk_probe(struct platform_device *pdev)
{
struct lpss_clk_data *drvdata;