linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 1/2] pch_can: Change company name OKI SEMICONDUCTOR to LAPIS Semiconductor
@ 2012-01-27 11:05 Tomoya MORINAGA
  2012-01-27 11:05 ` [PATCH 2/2] Kconfig: add information Tomoya MORINAGA
  2012-01-31 22:13 ` [PATCH 1/2] pch_can: Change company name OKI SEMICONDUCTOR to LAPIS Semiconductor Marc Kleine-Budde
  0 siblings, 2 replies; 4+ messages in thread
From: Tomoya MORINAGA @ 2012-01-27 11:05 UTC (permalink / raw)
  To: Wolfgang Grandegger, Marc Kleine-Budde, linux-can, netdev, linux-kernel
  Cc: Tomoya MORINAGA

On October 1 in 2011,
    OKI SEMICONDUCTOR Co., Ltd. changed the company name in to LAPIS Semiconductor

Signed-off-by: Tomoya MORINAGA <tomoya.rohm@gmail.com>
---
 drivers/net/can/pch_can.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/net/can/pch_can.c b/drivers/net/can/pch_can.c
index d11fbb2..cc3ed57 100644
--- a/drivers/net/can/pch_can.c
+++ b/drivers/net/can/pch_can.c
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 1999 - 2010 Intel Corporation.
- * Copyright (C) 2010 OKI SEMICONDUCTOR CO., LTD.
+ * Copyright (C) 2010 LAPIS SEMICONDUCTOR CO., LTD.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
-- 
1.7.7.6


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [PATCH 2/2] Kconfig: add information
  2012-01-27 11:05 [PATCH 1/2] pch_can: Change company name OKI SEMICONDUCTOR to LAPIS Semiconductor Tomoya MORINAGA
@ 2012-01-27 11:05 ` Tomoya MORINAGA
  2012-01-31 22:14   ` Marc Kleine-Budde
  2012-01-31 22:13 ` [PATCH 1/2] pch_can: Change company name OKI SEMICONDUCTOR to LAPIS Semiconductor Marc Kleine-Budde
  1 sibling, 1 reply; 4+ messages in thread
From: Tomoya MORINAGA @ 2012-01-27 11:05 UTC (permalink / raw)
  To: Wolfgang Grandegger, Marc Kleine-Budde, linux-can, netdev, linux-kernel
  Cc: Tomoya MORINAGA

Current menu description, not easy to understand what the description
means.
So, add information about the device.

Signed-off-by: Tomoya MORINAGA <tomoya.rohm@gmail.com>
---
 drivers/net/can/Kconfig |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/net/can/Kconfig b/drivers/net/can/Kconfig
index ab45758..fb985205 100644
--- a/drivers/net/can/Kconfig
+++ b/drivers/net/can/Kconfig
@@ -103,11 +103,11 @@ config CAN_FLEXCAN
 	  Say Y here if you want to support for Freescale FlexCAN.
 
 config PCH_CAN
-	tristate "PCH CAN"
+	tristate "Intel EG20T PCH CAN controller"
 	depends on CAN_DEV && PCI
 	---help---
-	  This driver is for PCH CAN of Topcliff which is an IOH for x86
-	  embedded processor.
+	  This driver is for PCH CAN of Topcliff(Intel EG20T PCH) which
+	  is an IOH for x86 embedded processor(Intel Atom E6xx series).
 	  This driver can access CAN bus.
 
 source "drivers/net/can/mscan/Kconfig"
-- 
1.7.7.6


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* Re: [PATCH 1/2] pch_can: Change company name OKI SEMICONDUCTOR to LAPIS Semiconductor
  2012-01-27 11:05 [PATCH 1/2] pch_can: Change company name OKI SEMICONDUCTOR to LAPIS Semiconductor Tomoya MORINAGA
  2012-01-27 11:05 ` [PATCH 2/2] Kconfig: add information Tomoya MORINAGA
@ 2012-01-31 22:13 ` Marc Kleine-Budde
  1 sibling, 0 replies; 4+ messages in thread
From: Marc Kleine-Budde @ 2012-01-31 22:13 UTC (permalink / raw)
  To: Tomoya MORINAGA; +Cc: Wolfgang Grandegger, linux-can, netdev, linux-kernel

[-- Attachment #1: Type: text/plain, Size: 532 bytes --]

On 01/27/2012 12:05 PM, Tomoya MORINAGA wrote:
> On October 1 in 2011,
>     OKI SEMICONDUCTOR Co., Ltd. changed the company name in to LAPIS Semiconductor
> 
> Signed-off-by: Tomoya MORINAGA <tomoya.rohm@gmail.com>

Applied to can-next.
tnx Marc

-- 
Pengutronix e.K.                  | Marc Kleine-Budde           |
Industrial Linux Solutions        | Phone: +49-231-2826-924     |
Vertretung West/Dortmund          | Fax:   +49-5121-206917-5555 |
Amtsgericht Hildesheim, HRA 2686  | http://www.pengutronix.de   |


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 262 bytes --]

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH 2/2] Kconfig: add information
  2012-01-27 11:05 ` [PATCH 2/2] Kconfig: add information Tomoya MORINAGA
@ 2012-01-31 22:14   ` Marc Kleine-Budde
  0 siblings, 0 replies; 4+ messages in thread
From: Marc Kleine-Budde @ 2012-01-31 22:14 UTC (permalink / raw)
  To: Tomoya MORINAGA; +Cc: Wolfgang Grandegger, linux-can, netdev, linux-kernel

[-- Attachment #1: Type: text/plain, Size: 545 bytes --]

On 01/27/2012 12:05 PM, Tomoya MORINAGA wrote:
> Current menu description, not easy to understand what the description
> means.
> So, add information about the device.
> 
> Signed-off-by: Tomoya MORINAGA <tomoya.rohm@gmail.com>

Applied to can-next.
tnx Marc

-- 
Pengutronix e.K.                  | Marc Kleine-Budde           |
Industrial Linux Solutions        | Phone: +49-231-2826-924     |
Vertretung West/Dortmund          | Fax:   +49-5121-206917-5555 |
Amtsgericht Hildesheim, HRA 2686  | http://www.pengutronix.de   |


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 262 bytes --]

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2012-01-31 22:14 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-01-27 11:05 [PATCH 1/2] pch_can: Change company name OKI SEMICONDUCTOR to LAPIS Semiconductor Tomoya MORINAGA
2012-01-27 11:05 ` [PATCH 2/2] Kconfig: add information Tomoya MORINAGA
2012-01-31 22:14   ` Marc Kleine-Budde
2012-01-31 22:13 ` [PATCH 1/2] pch_can: Change company name OKI SEMICONDUCTOR to LAPIS Semiconductor Marc Kleine-Budde

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).