diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-25 20:19:23 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-25 20:19:23 -0700 |
| commit | ede847c406054ba2a1ef2d165d3fd9f8e2b8d1bc (patch) | |
| tree | f2533f1c9e569249b579e9d2615ba4b772eedd70 /arch | |
| parent | 9eed28679282238210ad5e80bb91df30fec6d7db (diff) | |
| parent | 64271c4d909a15bc588f053a739db2e6df336d7d (diff) | |
| download | linux-ede847c406054ba2a1ef2d165d3fd9f8e2b8d1bc.tar.gz linux-ede847c406054ba2a1ef2d165d3fd9f8e2b8d1bc.tar.xz | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm:
[ARM] 3902/1: Enable GPIO81-84 on PXA255
[ARM] Comment out missing configuration symbols
[ARM] 3898/1: corgi_bl fix module loading
[ARM] 3897/1: corgi_bl fix module compiling
[ARM] Fix breakage in 7281c248f797723f66244b7ecef204620f664648
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-ixp2000/ixdp2400.c | 4 | ||||
| -rw-r--r-- | arch/arm/mach-lh7a40x/Kconfig | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-ixp2000/ixdp2400.c b/arch/arm/mach-ixp2000/ixdp2400.c index 9ee63834e603..0fdd03ab36e6 100644 --- a/arch/arm/mach-ixp2000/ixdp2400.c +++ b/arch/arm/mach-ixp2000/ixdp2400.c @@ -135,11 +135,11 @@ static void ixdp2400_pci_postinit(void) if (ixdp2x00_master_npu()) { dev = pci_get_bus_and_slot(1, IXDP2400_SLAVE_ENET_DEVFN); pci_remove_bus_device(dev); - pci_dev_put(dev) + pci_dev_put(dev); } else { dev = pci_get_bus_and_slot(1, IXDP2400_MASTER_ENET_DEVFN); pci_remove_bus_device(dev); - pci_dev_put(dev) + pci_dev_put(dev); ixdp2x00_slave_pci_postinit(); } diff --git a/arch/arm/mach-lh7a40x/Kconfig b/arch/arm/mach-lh7a40x/Kconfig index 558a34f53b1c..147b01928a9b 100644 --- a/arch/arm/mach-lh7a40x/Kconfig +++ b/arch/arm/mach-lh7a40x/Kconfig @@ -14,7 +14,7 @@ config MACH_LPD7A400 bool "LPD7A400 Card Engine" select ARCH_LH7A400 # select IDE_POLL - select HAS_TOUCHSCREEN_ADS7843_LH7 +# select HAS_TOUCHSCREEN_ADS7843_LH7 help Say Y here if you are using Logic Product Development's LPD7A400 CardEngine. For the time being, the LPD7A400 and @@ -24,7 +24,7 @@ config MACH_LPD7A404 bool "LPD7A404 Card Engine" select ARCH_LH7A404 # select IDE_POLL - select HAS_TOUCHSCREEN_ADC_LH7 +# select HAS_TOUCHSCREEN_ADC_LH7 help Say Y here if you are using Logic Product Development's LPD7A404 CardEngine. For the time being, the LPD7A400 and |