Merge git://git.infradead.org/battery-2.6

[karo-tx-linux.git] / drivers / power / s3c_adc_battery.c

diff --git a/drivers/power/s3c_adc_battery.c b/drivers/power/s3c_adc_battery.c
index 7bc5bfe55ce94a22b23771ad2c02d1bea9d666a2..4255f2358b138beb96305e832d778bef9ab15285 100644 (file)
--- a/drivers/power/s3c_adc_battery.c
+++ b/drivers/power/s3c_adc_battery.c
@@ -1,5 +1,5 @@
 /*
- *     iPAQ h1930/h1940/rx1950 battery controler driver
+ *     iPAQ h1930/h1940/rx1950 battery controller driver
  *     Copyright (c) Vasily Khoruzhick
  *     Based on h1940_battery.c by Arnaud Patard
  *
@@ -433,5 +433,5 @@ static void __exit s3c_adc_bat_exit(void)
 module_exit(s3c_adc_bat_exit);
 
 MODULE_AUTHOR("Vasily Khoruzhick <anarsoul@gmail.com>");
-MODULE_DESCRIPTION("iPAQ H1930/H1940/RX1950 battery controler driver");
+MODULE_DESCRIPTION("iPAQ H1930/H1940/RX1950 battery controller driver");
 MODULE_LICENSE("GPL");