shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-09 20:32:04 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' of 10.10.10.201:/home/rockchip/rk2818/kernel into develop

Browse Source
This commit is contained in:
swj
2010-08-10 19:50:21 -07:00
parent 52ae9be9fb df3dde1323
commit e73284dbf3
3 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/mach-rk2818/board-raho.c
View File

@@ -49,7 +49,7 @@
#include "devices.h"
#include "../../../drivers/spi/rk2818_spim.h"
#include "../../../drivers/regulator/rk2818_lp8725.h"
#include <linux/regulator/rk2818_lp8725.h>
/* --------------------------------------------------------------------
* <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>rk2818_gpioBank<6E><6B><EFBFBD>飬<EFBFBD><E9A3AC><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>GPIO<49>Ĵ<EFBFBD><C4B4><EFBFBD><EFBFBD><EFBFBD>ID<49>ͼĴ<CDBC><C4B4><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ַ<EFBFBD><D6B7>
* -------------------------------------------------------------------- */

2
drivers/regulator/rk2818_lp8725.c
View File

@@ -30,7 +30,7 @@ REVISION 0.01
#include <linux/i2c.h>
#include <linux/kernel.h>
#include <linux/regulator/driver.h>
#include "rk2818_lp8725.h"
#include <linux/regulator/rk2818_lp8725.h>
#if 0

0
drivers/regulator/rk2818_lp8725.h → include/linux/regulator/rk2818_lp8725.h
View File