git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'next/devel2' of git://git.linaro.org/people/arnd/arm-soc
[pandora-kernel.git]
/
arch
/
arm
/
plat-samsung
/
include
/
plat
/
adc-core.h
diff --git
a/arch/arm/plat-samsung/include/plat/adc-core.h
b/arch/arm/plat-samsung/include/plat/adc-core.h
index
a281568
..
a927bee
100644
(file)
--- a/
arch/arm/plat-samsung/include/plat/adc-core.h
+++ b/
arch/arm/plat-samsung/include/plat/adc-core.h
@@
-20,7
+20,7
@@
/* re-define device name depending on support. */
static inline void s3c_adc_setname(char *name)
{
-#if
def CONFIG_SAMSUNG_DEV_ADC
+#if
defined(CONFIG_SAMSUNG_DEV_ADC) || defined(CONFIG_PLAT_S3C24XX)
s3c_device_adc.name = name;
#endif
}