---

yaml --- r: 297935 b: refs/heads/master c: e39b828 h: refs/heads/master i: 297933: 82bb70c 297931: 0980a65 297927: 68b08d6 297919: 748550e v: v3
git-mirror · Mar 26, 2012 · a4ccd2a · a4ccd2a
1 parent 8d01f40
commit a4ccd2a
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3832246ddd83391187edff8af328f9e9684d3177
+refs/heads/master: e39b828f5355e41a8fd24f413fb9dfb81d808397
diff --git a/trunk/drivers/power/Kconfig b/trunk/drivers/power/Kconfig
@@ -235,7 +235,7 @@ config CHARGER_TWL4030
 	  Say Y here to enable support for TWL4030 Battery Charge Interface.
 
 config CHARGER_LP8727
-	tristate "National Semiconductor LP8727 charger driver"
+	tristate "TI/National Semiconductor LP8727 charger driver"
 	depends on I2C
 	help
 	  Say Y here to enable support for LP8727 Charger Driver.

diff --git a/trunk/drivers/power/lp8727_charger.c b/trunk/drivers/power/lp8727_charger.c
@@ -1,6 +1,7 @@
 /*
  * Driver for LP8727 Micro/Mini USB IC with intergrated charger
  *
+ *			Copyright (C) 2011 Texas Instruments
  *			Copyright (C) 2011 National Semiconductor
  *
  * This program is free software; you can redistribute it and/or modify
@@ -489,7 +490,7 @@ static void __exit lp8727_exit(void)
 module_init(lp8727_init);
 module_exit(lp8727_exit);
 
-MODULE_DESCRIPTION("National Semiconductor LP8727 charger driver");
+MODULE_DESCRIPTION("TI/National Semiconductor LP8727 charger driver");
 MODULE_AUTHOR
     ("Woogyom Kim <milo.kim@ti.com>, Daniel Jeong <daniel.jeong@ti.com>");
 MODULE_LICENSE("GPL");
diff --git a/trunk/include/linux/lp8727.h b/trunk/include/linux/lp8727.h
@@ -1,4 +1,7 @@
 /*
+ * LP8727 Micro/Mini USB IC with intergrated charger
+ *
+ *			Copyright (C) 2011 Texas Instruments
  *			Copyright (C) 2011 National Semiconductor
  *
  * This program is free software; you can redistribute it and/or modify