Merge branch 'master' of git://git.denx.de/u-boot-ppc4xx

[oweals/u-boot.git] / drivers / misc / ali512x.c

diff --git a/drivers/misc/ali512x.c b/drivers/misc/ali512x.c
index 7b7edc09af94c35fde778c47733bf12abb94d719..d6a2c1f57752b9e25d02d89cf67eb0c633138d28 100644 (file)
--- a/drivers/misc/ali512x.c
+++ b/drivers/misc/ali512x.c
@@ -32,8 +32,6 @@
 
 #include <config.h>
 
-#ifdef CONFIG_ALI152X
-
 #include <common.h>
 #include <asm/io.h>
 #include <asm/ic/ali512x.h>
@@ -262,7 +260,7 @@ void ali512x_set_kbc(int enabled, u8 kbc_irq, u8 mouse_irq)
  * SIO reigster 3 (CIO Address Selection) bit definitions:
  * bit 7   CIO index and data registers enabled
  * bit 1-0 CIO indirect registers port address select
- *              0  index = 0xE0 data = 0xE1
+ *      0  index = 0xE0 data = 0xE1
  *       1  index = 0xE2 data = 0xE3
  *       2  index = 0xE4 data = 0xE5
  *       3  index = 0xEA data = 0xEB
@@ -418,6 +416,3 @@ int ali512x_cio_in(int pin)
 
        return data & bit;
 }
-
-
-#endif