diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-28 15:44:06 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-28 15:44:06 -0700 |
| commit | 5847098cd896c92819800e17e983bf6530035209 (patch) | |
| tree | 9ab836fd4290caca99223b9391885625e934e587 /arch/cris/arch-v32/drivers/Makefile | |
| parent | 7f5fe3ec8eab23cc28e8fb7d23b4777ad6a05734 (diff) | |
| parent | 33dc0ad78a961dfbbb2fb65fd9df3b66ba119f57 (diff) | |
| download | kernel_replicant_linux-5847098cd896c92819800e17e983bf6530035209.tar.gz kernel_replicant_linux-5847098cd896c92819800e17e983bf6530035209.tar.bz2 kernel_replicant_linux-5847098cd896c92819800e17e983bf6530035209.zip | |
Merge branch 'for-linus' of git://www.jni.nu/cris
* 'for-linus' of git://www.jni.nu/cris:
Correct auto-restart of syscalls via restartblock
CRISv10: Fix return before mutex_unlock in pcf8563
Drop the CRISv32 version of pcf8563
Diffstat (limited to 'arch/cris/arch-v32/drivers/Makefile')
| -rw-r--r-- | arch/cris/arch-v32/drivers/Makefile | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/cris/arch-v32/drivers/Makefile b/arch/cris/arch-v32/drivers/Makefile index e8c02437edaf..39aa3c117a86 100644 --- a/arch/cris/arch-v32/drivers/Makefile +++ b/arch/cris/arch-v32/drivers/Makefile @@ -7,7 +7,6 @@ obj-$(CONFIG_ETRAX_AXISFLASHMAP) += axisflashmap.o obj-$(CONFIG_ETRAXFS) += mach-fs/ obj-$(CONFIG_CRIS_MACH_ARTPEC3) += mach-a3/ obj-$(CONFIG_ETRAX_IOP_FW_LOAD) += iop_fw_load.o -obj-$(CONFIG_ETRAX_PCF8563) += pcf8563.o obj-$(CONFIG_ETRAX_I2C) += i2c.o obj-$(CONFIG_ETRAX_SYNCHRONOUS_SERIAL) += sync_serial.o obj-$(CONFIG_PCI) += pci/ |