Commit f957cc66 authored by Linus Torvalds's avatar Linus Torvalds

Merge bk://bk.arm.linux.org.uk/linux-2.6-rmk

into ppc970.osdl.org:/home/torvalds/v2.6/linux
parents 70d5032e e5f20da1
...@@ -589,8 +589,7 @@ sa1111_init_one_child(struct sa1111 *sachip, struct resource *parent, ...@@ -589,8 +589,7 @@ sa1111_init_one_child(struct sa1111 *sachip, struct resource *parent,
ret = dmabounce_register_dev(&dev->dev, 1024, 4096); ret = dmabounce_register_dev(&dev->dev, 1024, 4096);
if (ret) { if (ret) {
printk("SA1111: Failed to register %s with dmabounce", dev->dev.bus_id); printk("SA1111: Failed to register %s with dmabounce", dev->dev.bus_id);
kfree(dev); device_unregister(&dev->dev);
device_unregister(dev);
} }
} }
} }
...@@ -779,8 +778,7 @@ int dma_needs_bounce(struct device *dev, dma_addr_t addr, size_t size) ...@@ -779,8 +778,7 @@ int dma_needs_bounce(struct device *dev, dma_addr_t addr, size_t size)
/* /*
* Check to see if either the start or end are illegal. * Check to see if either the start or end are illegal.
*/ */
return ((addr & ~(*dev->dma_mask))) || return ((addr & ~dma_mask)) || ((addr + size - 1) & ~dma_mask);
((addr + size - 1) & ~(*dev->dma_mask));
} }
struct sa1111_save_data { struct sa1111_save_data {
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
# To add an entry into this database, please see Documentation/arm/README, # To add an entry into this database, please see Documentation/arm/README,
# or contact rmk@arm.linux.org.uk # or contact rmk@arm.linux.org.uk
# #
# Last update: Thu Apr 15 10:14:37 2004 # Last update: Thu Apr 29 19:06:33 2004
# #
# machine_is_xxx CONFIG_xxxx MACH_TYPE_xxx number # machine_is_xxx CONFIG_xxxx MACH_TYPE_xxx number
# #
...@@ -242,7 +242,7 @@ killbear SA1100_KILLBEAR KILLBEAR 230 ...@@ -242,7 +242,7 @@ killbear SA1100_KILLBEAR KILLBEAR 230
yoho ARCH_YOHO YOHO 231 yoho ARCH_YOHO YOHO 231
jasper ARCH_JASPER JASPER 232 jasper ARCH_JASPER JASPER 232
dsc25 ARCH_DSC25 DSC25 233 dsc25 ARCH_DSC25 DSC25 233
innovator ARCH_INNOVATOR INNOVATOR 234 omap_innovator MACH_OMAP_INNOVATOR OMAP_INNOVATOR 234
ramses ARCH_RAMSES RAMSES 235 ramses ARCH_RAMSES RAMSES 235
s28x ARCH_S28X S28X 236 s28x ARCH_S28X S28X 236
mport3 ARCH_MPORT3 MPORT3 237 mport3 ARCH_MPORT3 MPORT3 237
...@@ -390,7 +390,7 @@ espd_4510b ARCH_ESPD_4510B ESPD_4510B 378 ...@@ -390,7 +390,7 @@ espd_4510b ARCH_ESPD_4510B ESPD_4510B 378
mp1x ARCH_MP1X MP1X 379 mp1x ARCH_MP1X MP1X 379
at91rm9200tb ARCH_AT91RM9200TB AT91RM9200TB 380 at91rm9200tb ARCH_AT91RM9200TB AT91RM9200TB 380
adsvgx ARCH_ADSVGX ADSVGX 381 adsvgx ARCH_ADSVGX ADSVGX 381
omap_h2 ARCH_OMAP_H2 OMAP_H2 382 omap_h2 MACH_OMAP_H2 OMAP_H2 382
pelee ARCH_PELEE PELEE 383 pelee ARCH_PELEE PELEE 383
e740 MACH_E740 E740 384 e740 MACH_E740 E740 384
iq80331 ARCH_IQ80331 IQ80331 385 iq80331 ARCH_IQ80331 IQ80331 385
...@@ -523,3 +523,13 @@ montajade MACH_MONTAJADE MONTAJADE 512 ...@@ -523,3 +523,13 @@ montajade MACH_MONTAJADE MONTAJADE 512
sg560 MACH_SG560 SG560 513 sg560 MACH_SG560 SG560 513
dp1000 MACH_DP1000 DP1000 514 dp1000 MACH_DP1000 DP1000 514
omap_osk MACH_OMAP_OSK OMAP_OSK 515 omap_osk MACH_OMAP_OSK OMAP_OSK 515
rg100v3 MACH_RG100V3 RG100V3 516
mx2ads MACH_MX2ADS MX2ADS 517
pxa_kilo MACH_PXA_KILO PXA_KILO 518
ixp4xx_eagle MACH_IXP4XX_EAGLE IXP4XX_EAGLE 519
tosa MACH_TOSA TOSA 520
mb2520f MACH_MB2520F MB2520F 521
emc1000 MACH_EMC1000 EMC1000 522
tidsc25 MACH_TIDSC25 TIDSC25 523
akcpmxl MACH_AKCPMXL AKCPMXL 524
av3xx MACH_AV3XX AV3XX 525
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment