diff options
author | Ben Dooks <ben-linux@fluff.org> | 2010-05-19 18:04:03 +0900 |
---|---|---|
committer | Ben Dooks <ben-linux@fluff.org> | 2010-05-19 18:04:03 +0900 |
commit | 359542b2a1d8a945c135c2c4ea4434ce69fc2723 (patch) | |
tree | 4dc5b1dfc14d9ae73043728749007750e53a92eb /arch/arm/mach-s5pv210/Makefile | |
parent | bc3b67b8e965c1b499d604b7ec7d2e6090570c13 (diff) | |
parent | ea5f50706385b61c1c0d24271bbe7c6e93129fbc (diff) | |
download | kernel_samsung_aries-359542b2a1d8a945c135c2c4ea4434ce69fc2723.zip kernel_samsung_aries-359542b2a1d8a945c135c2c4ea4434ce69fc2723.tar.gz kernel_samsung_aries-359542b2a1d8a945c135c2c4ea4434ce69fc2723.tar.bz2 |
ARM: Merge for-2635/s5p-general
Merge branch 'for-2635/s5p-general' into for-linus/samsung2
Diffstat (limited to 'arch/arm/mach-s5pv210/Makefile')
-rw-r--r-- | arch/arm/mach-s5pv210/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-s5pv210/Makefile b/arch/arm/mach-s5pv210/Makefile index 8ebf51c..0acbdb3 100644 --- a/arch/arm/mach-s5pv210/Makefile +++ b/arch/arm/mach-s5pv210/Makefile @@ -12,7 +12,7 @@ obj- := # Core support for S5PV210 system -obj-$(CONFIG_CPU_S5PV210) += cpu.o init.o clock.o +obj-$(CONFIG_CPU_S5PV210) += cpu.o init.o clock.o gpiolib.o # machine support |