diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-12-27 09:44:11 -0500 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-12-27 09:44:11 -0500 |
| commit | a44dca1717ce2c2381339e21c07d1731a63a7888 (patch) | |
| tree | 3d0b3bd26492f9fa1f1f1c1ad838315b266da7c1 /arch/arm/plat-pxa/Makefile | |
| parent | 30ebc5e44d057a1619ad63fe32c8c1670c37c4b8 (diff) | |
| parent | a49f0d1ea3ec94fc7cf33a7c36a16343b74bd565 (diff) | |
Merge tag 'v3.8-rc1' into staging/for_v3.9
Linux 3.8-rc1
* tag 'v3.8-rc1': (10696 commits)
Linux 3.8-rc1
Revert "nfsd: warn on odd reply state in nfsd_vfs_read"
ARM: dts: fix duplicated build target and alphabetical sort out for exynos
dm stripe: add WRITE SAME support
dm: remove map_info
dm snapshot: do not use map_context
dm thin: dont use map_context
dm raid1: dont use map_context
dm flakey: dont use map_context
dm raid1: rename read_record to bio_record
dm: move target request nr to dm_target_io
dm snapshot: use per_bio_data
dm verity: use per_bio_data
dm raid1: use per_bio_data
dm: introduce per_bio_data
dm kcopyd: add WRITE SAME support to dm_kcopyd_zero
dm linear: add WRITE SAME support
dm: add WRITE SAME support
dm: prepare to support WRITE SAME
dm ioctl: use kmalloc if possible
...
Conflicts:
MAINTAINERS
Diffstat (limited to 'arch/arm/plat-pxa/Makefile')
| -rw-r--r-- | arch/arm/plat-pxa/Makefile | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/plat-pxa/Makefile b/arch/arm/plat-pxa/Makefile index af8e484001e5..1fc941944912 100644 --- a/arch/arm/plat-pxa/Makefile +++ b/arch/arm/plat-pxa/Makefile | |||
| @@ -5,7 +5,6 @@ | |||
| 5 | obj-y := dma.o | 5 | obj-y := dma.o |
| 6 | 6 | ||
| 7 | obj-$(CONFIG_PXA3xx) += mfp.o | 7 | obj-$(CONFIG_PXA3xx) += mfp.o |
| 8 | obj-$(CONFIG_PXA95x) += mfp.o | ||
| 9 | obj-$(CONFIG_ARCH_MMP) += mfp.o | 8 | obj-$(CONFIG_ARCH_MMP) += mfp.o |
| 10 | 9 | ||
| 11 | obj-$(CONFIG_PXA_SSP) += ssp.o | 10 | obj-$(CONFIG_PXA_SSP) += ssp.o |