Makefile: do not override LC_CTYPE

[safe/jmp/linux-2.6] / arch / arm / mach-sa1100 / h3600.c

diff --git a/arch/arm/mach-sa1100/h3600.c b/arch/arm/mach-sa1100/h3600.c
index 65ab286..af3b714 100644 (file)
--- a/arch/arm/mach-sa1100/h3600.c
+++ b/arch/arm/mach-sa1100/h3600.c
@@ -1,48 +1,22 @@
 /*
- * Hardware definitions for Compaq iPAQ H3xxx Handheld Computers
+ * Support for Compaq iPAQ H3600 handheld computer
  *
- * Copyright 2000,1 Compaq Computer Corporation.
+ * Copyright (c) 2000,1 Compaq Computer Corporation. (Author: Jamey Hicks)
+ * Copyright (c) 2009 Dmitry Artamonow <mad_soft@inbox.ru>
  *
- * Use consistent with the GNU GPL is permitted,
- * provided that this copyright notice is
- * preserved in its entirety in all copies and derived works.
- *
- * COMPAQ COMPUTER CORPORATION MAKES NO WARRANTIES, EXPRESSED OR IMPLIED,
- * AS TO THE USEFULNESS OR CORRECTNESS OF THIS CODE OR ITS
- * FITNESS FOR ANY PARTICULAR PURPOSE.
- *
- * Author: Jamey Hicks.
- *
- * History:
- *
- * 2001-10-??  Andrew Christian   Added support for iPAQ H3800
- *                                and abstracted EGPIO interface.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
  *
  */
-#include <linux/module.h>
+
 #include <linux/init.h>
 #include <linux/kernel.h>
-#include <linux/tty.h>
-#include <linux/pm.h>
-#include <linux/device.h>
-#include <linux/mfd/htc-egpio.h>
-#include <linux/mtd/mtd.h>
-#include <linux/mtd/partitions.h>
-#include <linux/serial_core.h>
 #include <linux/gpio.h>
-#include <linux/platform_device.h>
 
-#include <asm/irq.h>
-#include <mach/hardware.h>
 #include <asm/mach-types.h>
-#include <asm/setup.h>
-
-#include <asm/mach/irq.h>
 #include <asm/mach/arch.h>
-#include <asm/mach/flash.h>
 #include <asm/mach/irda.h>
-#include <asm/mach/map.h>
-#include <asm/mach/serial_sa1100.h>
 
 #include <mach/h3xxx.h>
 
@@ -53,14 +27,22 @@
  */
 static void h3600_lcd_power(int enable)
 {
-       if (gpio_request(H3XXX_EGPIO_LCD_ON, "LCD power"))
+       if (gpio_request(H3XXX_EGPIO_LCD_ON, "LCD power")) {
+               pr_err("%s: can't request H3XXX_EGPIO_LCD_ON\n", __func__);
                goto err1;
-       if (gpio_request(H3600_EGPIO_LCD_PCI, "LCD control"))
+       }
+       if (gpio_request(H3600_EGPIO_LCD_PCI, "LCD control")) {
+               pr_err("%s: can't request H3XXX_EGPIO_LCD_PCI\n", __func__);
                goto err2;
-       if (gpio_request(H3600_EGPIO_LCD_5V_ON, "LCD 5v"))
+       }
+       if (gpio_request(H3600_EGPIO_LCD_5V_ON, "LCD 5v")) {
+               pr_err("%s: can't request H3XXX_EGPIO_LCD_5V_ON\n", __func__);
                goto err3;
-       if (gpio_request(H3600_EGPIO_LVDD_ON, "LCD 9v/-6.5v"))
+       }
+       if (gpio_request(H3600_EGPIO_LVDD_ON, "LCD 9v/-6.5v")) {
+               pr_err("%s: can't request H3600_EGPIO_LVDD_ON\n", __func__);
                goto err4;
+       }
 
        gpio_direction_output(H3XXX_EGPIO_LCD_ON, enable);
        gpio_direction_output(H3600_EGPIO_LCD_PCI, enable);