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/mach-at91/at91sam9263_devices.c | |
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/mach-at91/at91sam9263_devices.c')
-rw-r--r-- | arch/arm/mach-at91/at91sam9263_devices.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-at91/at91sam9263_devices.c b/arch/arm/mach-at91/at91sam9263_devices.c index 9c61e59a2104..ed666f5cb01d 100644 --- a/arch/arm/mach-at91/at91sam9263_devices.c +++ b/arch/arm/mach-at91/at91sam9263_devices.c | |||
@@ -20,12 +20,12 @@ | |||
20 | #include <linux/fb.h> | 20 | #include <linux/fb.h> |
21 | #include <video/atmel_lcdc.h> | 21 | #include <video/atmel_lcdc.h> |
22 | 22 | ||
23 | #include <mach/board.h> | ||
24 | #include <mach/at91sam9263.h> | 23 | #include <mach/at91sam9263.h> |
25 | #include <mach/at91sam9263_matrix.h> | 24 | #include <mach/at91sam9263_matrix.h> |
26 | #include <mach/at91_matrix.h> | 25 | #include <mach/at91_matrix.h> |
27 | #include <mach/at91sam9_smc.h> | 26 | #include <mach/at91sam9_smc.h> |
28 | 27 | ||
28 | #include "board.h" | ||
29 | #include "generic.h" | 29 | #include "generic.h" |
30 | 30 | ||
31 | 31 | ||
@@ -1199,7 +1199,7 @@ static struct resource ssc0_resources[] = { | |||
1199 | }; | 1199 | }; |
1200 | 1200 | ||
1201 | static struct platform_device at91sam9263_ssc0_device = { | 1201 | static struct platform_device at91sam9263_ssc0_device = { |
1202 | .name = "ssc", | 1202 | .name = "at91rm9200_ssc", |
1203 | .id = 0, | 1203 | .id = 0, |
1204 | .dev = { | 1204 | .dev = { |
1205 | .dma_mask = &ssc0_dmamask, | 1205 | .dma_mask = &ssc0_dmamask, |
@@ -1241,7 +1241,7 @@ static struct resource ssc1_resources[] = { | |||
1241 | }; | 1241 | }; |
1242 | 1242 | ||
1243 | static struct platform_device at91sam9263_ssc1_device = { | 1243 | static struct platform_device at91sam9263_ssc1_device = { |
1244 | .name = "ssc", | 1244 | .name = "at91rm9200_ssc", |
1245 | .id = 1, | 1245 | .id = 1, |
1246 | .dev = { | 1246 | .dev = { |
1247 | .dma_mask = &ssc1_dmamask, | 1247 | .dma_mask = &ssc1_dmamask, |