forge/linux-uconsole
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity Actions

a22:fix buiding error

Browse source
This commit is contained in:
lw 2012-02-01 14:43:23 +08:00
commit a4ec9a50e7
2 changed files with 5 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

3
arch/arm/configs/rk29_a22_defconfig
View file

@ -289,6 +289,9 @@ CONFIG_LCD_NT35510=y
CONFIG_LOGO=y
# CONFIG_LOGO_LINUX_MONO is not set
# CONFIG_LOGO_LINUX_VGA16 is not set
# CONFIG_LOGO_LINUX_CLUT224 is not set
CONFIG_LOGO_CHARGER_CLUT224=y
CONFIG_LOGO_G3_CLUT224=y
CONFIG_SOUND=y
CONFIG_SND=y
# CONFIG_SND_SUPPORT_OLD_API is not set

2
drivers/power/wm831x_power.c
View file

@ -1130,6 +1130,7 @@ static __devinit int wm831x_power_probe(struct platform_device *pdev)
}
#ifdef CONFIG_WM831X_WITH_BATTERY
int i;
for (i = 0; i < ARRAY_SIZE(wm831x_bat_irqs); i++) {
irq = platform_get_irq_byname(pdev, wm831x_bat_irqs[i]);
ret = request_threaded_irq(irq, NULL, wm831x_bat_irq,
@ -1197,6 +1198,7 @@ static __devexit int wm831x_power_remove(struct platform_device *pdev)
struct wm831x_power *wm831x_power = platform_get_drvdata(pdev);
int irq;
#ifdef CONFIG_WM831X_WITH_BATTERY
int i;
for (i = 0; i < ARRAY_SIZE(wm831x_bat_irqs); i++) {
irq = platform_get_irq_byname(pdev, wm831x_bat_irqs[i]);
free_irq(irq, wm831x_power);