aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/dma
diff options
context:
space:
mode:
authorTomoya MORINAGA <tomoya.rohm@gmail.com>2011-11-17 02:14:22 -0500
committerVinod Koul <vinod.koul@linux.intel.com>2011-11-17 03:57:41 -0500
commite79e72be298dc4726a641686032b8296c2fb473e (patch)
tree0d12afe85913df834fc57d0ffd87f569774a48f2 /drivers/dma
parent8e2d41f8c85613a3739e8b2600ac2c66c08422f3 (diff)
pch_dma: Change company name OKI SEMICONDUCTOR to LAPIS Semiconductor
On October 1 in 2011, OKI SEMICONDUCTOR Co., Ltd. changed the company name in to LAPIS Semiconductor Co., Ltd. Signed-off-by: Tomoya MORINAGA <tomoya.rohm@gmail.com> Signed-off-by: Vinod Koul <vinod.koul@linux.intel.com>
Diffstat (limited to 'drivers/dma')
-rw-r--r--drivers/dma/Kconfig4
-rw-r--r--drivers/dma/pch_dma.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig
index e514c4560f87..606592ecd04f 100644
--- a/drivers/dma/Kconfig
+++ b/drivers/dma/Kconfig
@@ -201,13 +201,13 @@ config PL330_DMA
201 platform_data for a dma-pl330 device. 201 platform_data for a dma-pl330 device.
202 202
203config PCH_DMA 203config PCH_DMA
204 tristate "Intel EG20T PCH / OKI Semi IOH(ML7213/ML7223) DMA support" 204 tristate "Intel EG20T PCH / LAPIS Semi IOH(ML7213/ML7223) DMA support"
205 depends on PCI && X86 205 depends on PCI && X86
206 select DMA_ENGINE 206 select DMA_ENGINE
207 help 207 help
208 Enable support for Intel EG20T PCH DMA engine. 208 Enable support for Intel EG20T PCH DMA engine.
209 209
210 This driver also can be used for OKI SEMICONDUCTOR IOH(Input/ 210 This driver also can be used for LAPIS Semiconductor IOH(Input/
211 Output Hub), ML7213 and ML7223. 211 Output Hub), ML7213 and ML7223.
212 ML7213 IOH is for IVI(In-Vehicle Infotainment) use and ML7223 IOH is 212 ML7213 IOH is for IVI(In-Vehicle Infotainment) use and ML7223 IOH is
213 for MP(Media Phone) use. 213 for MP(Media Phone) use.
diff --git a/drivers/dma/pch_dma.c b/drivers/dma/pch_dma.c
index a6d0e3dbed07..a9b8a7971211 100644
--- a/drivers/dma/pch_dma.c
+++ b/drivers/dma/pch_dma.c
@@ -1,7 +1,7 @@
1/* 1/*
2 * Topcliff PCH DMA controller driver 2 * Topcliff PCH DMA controller driver
3 * Copyright (c) 2010 Intel Corporation 3 * Copyright (c) 2010 Intel Corporation
4 * Copyright (C) 2011 OKI SEMICONDUCTOR CO., LTD. 4 * Copyright (C) 2011 LAPIS Semiconductor Co., Ltd.
5 * 5 *
6 * This program is free software; you can redistribute it and/or modify 6 * This program is free software; you can redistribute it and/or modify
7 * it under the terms of the GNU General Public License version 2 as 7 * it under the terms of the GNU General Public License version 2 as
@@ -1057,7 +1057,7 @@ static void __exit pch_dma_exit(void)
1057module_init(pch_dma_init); 1057module_init(pch_dma_init);
1058module_exit(pch_dma_exit); 1058module_exit(pch_dma_exit);
1059 1059
1060MODULE_DESCRIPTION("Intel EG20T PCH / OKI SEMICONDUCTOR ML7213 IOH " 1060MODULE_DESCRIPTION("Intel EG20T PCH / LAPIS Semiconductor ML7213/ML7223 IOH "
1061 "DMA controller driver"); 1061 "DMA controller driver");
1062MODULE_AUTHOR("Yong Wang <yong.y.wang@intel.com>"); 1062MODULE_AUTHOR("Yong Wang <yong.y.wang@intel.com>");
1063MODULE_LICENSE("GPL v2"); 1063MODULE_LICENSE("GPL v2");