diff mbox

[2/3] pxa2xx trizeps4: pcmcia remove unnecessary ifdefs

Message ID 1307370255-15963-3-git-send-email-jic23@cam.ac.uk (mailing list archive)
State New, archived
Headers show

Commit Message

Jonathan Cameron June 6, 2011, 2:24 p.m. UTC 
Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
---
 drivers/pcmcia/pxa2xx_trizeps4.c |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)

Comments

Marek Vasut June 6, 2011, 2:44 p.m. UTC | #1 
On Monday, June 06, 2011 04:24:14 PM Jonathan Cameron wrote:
> Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
> ---
>  drivers/pcmcia/pxa2xx_trizeps4.c |    4 ----
>  1 files changed, 0 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/pcmcia/pxa2xx_trizeps4.c
> b/drivers/pcmcia/pxa2xx_trizeps4.c index b829e65..57ddb96 100644
> --- a/drivers/pcmcia/pxa2xx_trizeps4.c
> +++ b/drivers/pcmcia/pxa2xx_trizeps4.c
> @@ -55,10 +55,6 @@ static int trizeps_pcmcia_hw_init(struct
> soc_pcmcia_socket *skt) }
>  		skt->socket.pci_irq = IRQ_GPIO(GPIO_PRDY);
>  		break;
> -
> -#ifndef CONFIG_MACH_TRIZEPS_CONXS
> -	case 1:
> -#endif
>  	default:
>  		break;
>  	}
Please add my

Acked-by: Marek Vasut <marek.vasut@gmail.com>

Thanks, cheers
Eric Miao June 15, 2011, 1:09 p.m. UTC | #2 
On Mon, Jun 6, 2011 at 10:44 PM, Marek Vasut <marek.vasut@gmail.com> wrote:
> On Monday, June 06, 2011 04:24:14 PM Jonathan Cameron wrote:
>> Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
>> ---
>>  drivers/pcmcia/pxa2xx_trizeps4.c |    4 ----
>>  1 files changed, 0 insertions(+), 4 deletions(-)
>>
>> diff --git a/drivers/pcmcia/pxa2xx_trizeps4.c
>> b/drivers/pcmcia/pxa2xx_trizeps4.c index b829e65..57ddb96 100644
>> --- a/drivers/pcmcia/pxa2xx_trizeps4.c
>> +++ b/drivers/pcmcia/pxa2xx_trizeps4.c
>> @@ -55,10 +55,6 @@ static int trizeps_pcmcia_hw_init(struct
>> soc_pcmcia_socket *skt) }
>>               skt->socket.pci_irq = IRQ_GPIO(GPIO_PRDY);
>>               break;
>> -
>> -#ifndef CONFIG_MACH_TRIZEPS_CONXS
>> -     case 1:
>> -#endif
>>       default:
>>               break;
>>       }
> Please add my
>
> Acked-by: Marek Vasut <marek.vasut@gmail.com>
>

Applied.

> Thanks, cheers
>
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
>
diff mbox

Patch

diff --git a/drivers/pcmcia/pxa2xx_trizeps4.c b/drivers/pcmcia/pxa2xx_trizeps4.c
index b829e65..57ddb96 100644
--- a/drivers/pcmcia/pxa2xx_trizeps4.c
+++ b/drivers/pcmcia/pxa2xx_trizeps4.c
@@ -55,10 +55,6 @@  static int trizeps_pcmcia_hw_init(struct soc_pcmcia_socket *skt)
 		}
 		skt->socket.pci_irq = IRQ_GPIO(GPIO_PRDY);
 		break;
-
-#ifndef CONFIG_MACH_TRIZEPS_CONXS
-	case 1:
-#endif
 	default:
 		break;
 	}