Patchwork print.c fix - remove empty pcidevs header

login
register
about
Submitter Adam Jurkowski
Date 2009-11-24 15:46:09
Message ID <4B0BFFC1.4060302@kontron.pl>
Download mbox | patch
Permalink /patch/590/
State Superseded
Headers show

Comments

Adam Jurkowski - 2009-11-24 15:46:09
Don't print out supported PCI devices header if all following lines are 
excluded from build.

Signed-off-by: Adam Jurkowski <adam.jurkowski@kontron.pl>
---
best regards,
Adam Jurkowski
Carl-Daniel Hailfinger - 2009-11-24 15:52:49
Hi Adam,

thanks for your patch.

On 24.11.2009 16:46, Adam Jurkowski wrote:
> Don't print out supported PCI devices header if all following lines
> are excluded from build.

Your patch unfortunately conflicts with
http://patchwork.coreboot.org/patch/576/ but I'll merge it once that
other patch is committed.

> Signed-off-by: Adam Jurkowski <adam.jurkowski@kontron.pl>

Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>

Regards,
Carl-Daniel
Carl-Daniel Hailfinger - 2009-12-14 00:08:43
Hi Adam,

On 24.11.2009 16:52, Carl-Daniel Hailfinger wrote:
> On 24.11.2009 16:46, Adam Jurkowski wrote:
>   
>> Don't print out supported PCI devices header if all following lines
>> are excluded from build.
>>     
>
> Your patch unfortunately conflicts with
> http://patchwork.coreboot.org/patch/576/ but I'll merge it once that
> other patch is committed.
>   

The conflicting patch has now been committed.
Would you mind regenerating your patch and resending it with the
original changelog? I have roughly 50 patches I need to manage and this
would reduce my load. Feel free to include my Acked-by statement in your
changelog to get a speedier commit.

One minor comment, though. Could you use parentheses like this?
#if (NIC3COM_SUPPORT == 1) || (GFXNVIDIA_SUPPORT == 1) ||
(DRKAISER_SUPPORT == 1) || (SATASII_SUPPORT == 1)

IMHO that makes the code more readable.


> Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>
>   

Regards,
Carl-Daniel

Patch

Index: print.c
===================================================================
--- print.c	(revision 775)
+++ print.c	(working copy)
@@ -227,8 +227,10 @@ 
 		print_supported_chips();
 		print_supported_chipsets();
 		print_supported_boards();
+#if NIC3COM_SUPPORT == 1 || GFXNVIDIA_SUPPORT == 1 || DRKAISER_SUPPORT == 1 || SATASII_SUPPORT == 1
 		printf("\nSupported PCI devices flashrom can use "
 		       "as programmer:\n\n");
+#endif
 #if NIC3COM_SUPPORT == 1
 		print_supported_pcidevs(nics_3com);
 #endif