diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-10-12 14:37:49 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-10-12 14:37:49 -0700 |
| commit | 589bf8d52b5bbb580962438ad9403ec6853bc12b (patch) | |
| tree | b11aaf7c0e6dfc207db237381bfc11739dffa809 /drivers | |
| parent | e3c6f15fecee5aaa2dd1d0b83b17d09b64997e31 (diff) | |
| parent | 787b2faadc4356b6c2c71feb42fb944fece9a12f (diff) | |
| download | kernel_samsung_tuna-589bf8d52b5bbb580962438ad9403ec6853bc12b.zip kernel_samsung_tuna-589bf8d52b5bbb580962438ad9403ec6853bc12b.tar.gz kernel_samsung_tuna-589bf8d52b5bbb580962438ad9403ec6853bc12b.tar.bz2 | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm: (24 commits)
ARM: force dcache flush if dcache_dirty bit set
[ARM] pxa: workaround errata #37 by not using half turbo switching
[ARM] pxamci: fix printing gpio numbers in pxamci_probe
[ARM] pxa/csb726: adjust duplicate structure field initialization
ARM: Add kmap_atomic type debugging
ARM: boolean bit testing
ARM: update die() output
ARM: Dump code/mem oops lines with the appropriate log level
ARM: Dump memory and backtrace as one printk per line
ARM: 5756/1: ep93xx: introduce clk parent
ARM: 5754/1: ep93xx: update i2c support
ARM: 5753/1: ep93xx: remove old EP93XX_GPIO_* defines
ARM: 5729/1: ep93xx: define EP93XX_*_PHYS_BASE with macros
ARM: 5751/1: ep93xx/micro9: Add Micro9-Slim
ARM: 5750/1: ep93xx/micro9: Update platform code
ARM: 5749/1: ep93xx/micro9: Update maintainer
ARM: 5752/1: SA1100: fix building of h3100
ARM: 5748/1: bcmring: fix build warning messages
ARM: 5747/1: Fix the start_pg value in free_memmap()
ARM: 5746/1: Handle possible translation errors in ARMv6/v7 coherent_user_range
...
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/mmc/host/pxamci.c | 4 | ||||
| -rw-r--r-- | drivers/spi/amba-pl022.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/mmc/host/pxamci.c b/drivers/mmc/host/pxamci.c index 5e0b152..b00d673 100644 --- a/drivers/mmc/host/pxamci.c +++ b/drivers/mmc/host/pxamci.c @@ -693,7 +693,7 @@ static int pxamci_probe(struct platform_device *pdev) if (gpio_is_valid(gpio_ro)) { ret = gpio_request(gpio_ro, "mmc card read only"); if (ret) { - dev_err(&pdev->dev, "Failed requesting gpio_ro %d\n", gpio_power); + dev_err(&pdev->dev, "Failed requesting gpio_ro %d\n", gpio_ro); goto err_gpio_ro; } gpio_direction_input(gpio_ro); @@ -701,7 +701,7 @@ static int pxamci_probe(struct platform_device *pdev) if (gpio_is_valid(gpio_cd)) { ret = gpio_request(gpio_cd, "mmc card detect"); if (ret) { - dev_err(&pdev->dev, "Failed requesting gpio_cd %d\n", gpio_power); + dev_err(&pdev->dev, "Failed requesting gpio_cd %d\n", gpio_cd); goto err_gpio_cd; } gpio_direction_input(gpio_cd); diff --git a/drivers/spi/amba-pl022.c b/drivers/spi/amba-pl022.c index 958a3ff..ff5bbb9 100644 --- a/drivers/spi/amba-pl022.c +++ b/drivers/spi/amba-pl022.c @@ -1826,7 +1826,7 @@ static struct amba_id pl022_ids[] = { * ST Micro derivative, this has 32bit wide * and 32 locations deep TX/RX FIFO */ - .id = 0x00108022, + .id = 0x01080022, .mask = 0xffffffff, .data = &vendor_st, }, |