Re: [patch 3/7] PCI: fix quirk-6700-fix.patch

2005-08-17 Thread Greg KH
On Tue, Aug 16, 2005 at 05:27:11PM -0700, Andrew Morton wrote:
> 
> hm.  I normally fold crappy little patches like this into the main patch
> before sending it Linuswards.  The submitter gets a mention in the s-o-b
> record and perhaps a one-line description if the fix was less than utterly
> trivial.

Ok, I will do that in the future, I just wanted to make sure everyone
got the proper credit.

thanks,

greg k-h
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/


Re: [patch 3/7] PCI: fix quirk-6700-fix.patch

2005-08-16 Thread Andrew Morton
Greg Kroah-Hartman <[EMAIL PROTECTED]> wrote:
>
> From: Andrew Morton <[EMAIL PROTECTED]>
> 
> drivers/built-in.o(.text+0x32c3): In function `quirk_pcie_pxh':
> /usr/src/25/drivers/pci/quirks.c:1312: undefined reference to 
> `disable_msi_mode'
> 
> Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
> Signed-off-by: Greg Kroah-Hartman <[EMAIL PROTECTED]>
> 
> ---
>  drivers/pci/pci.h |6 ++
>  1 files changed, 6 insertions(+)
> 
> --- gregkh-2.6.orig/drivers/pci/pci.h 2005-08-16 14:57:46.0 -0700
> +++ gregkh-2.6/drivers/pci/pci.h  2005-08-16 14:57:47.0 -0700
> @@ -46,7 +46,13 @@ extern int pci_msi_quirk;
>  #else
>  #define pci_msi_quirk 0
>  #endif
> +
> +#ifdef CONFIG_PCI_MSI
>  void disable_msi_mode(struct pci_dev *dev, int pos, int type);
> +#else
> +static inline void disable_msi_mode(struct pci_dev *dev, int pos, int type) 
> { }
> +#endif
> +
>  extern int pcie_mch_quirk;
>  extern struct device_attribute pci_dev_attrs[];
>  extern struct class_device_attribute class_device_attr_cpuaffinity;
> 

hm.  I normally fold crappy little patches like this into the main patch
before sending it Linuswards.  The submitter gets a mention in the s-o-b
record and perhaps a one-line description if the fix was less than utterly
trivial.

That's one advantage of the patch-scripts/quilt approach: these little
post-facto fixups don't pollute the upstream changelog record.

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/


[patch 3/7] PCI: fix quirk-6700-fix.patch

2005-08-16 Thread Greg Kroah-Hartman
From: Andrew Morton <[EMAIL PROTECTED]>

drivers/built-in.o(.text+0x32c3): In function `quirk_pcie_pxh':
/usr/src/25/drivers/pci/quirks.c:1312: undefined reference to `disable_msi_mode'

Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
Signed-off-by: Greg Kroah-Hartman <[EMAIL PROTECTED]>

---
 drivers/pci/pci.h |6 ++
 1 files changed, 6 insertions(+)

--- gregkh-2.6.orig/drivers/pci/pci.h   2005-08-16 14:57:46.0 -0700
+++ gregkh-2.6/drivers/pci/pci.h2005-08-16 14:57:47.0 -0700
@@ -46,7 +46,13 @@ extern int pci_msi_quirk;
 #else
 #define pci_msi_quirk 0
 #endif
+
+#ifdef CONFIG_PCI_MSI
 void disable_msi_mode(struct pci_dev *dev, int pos, int type);
+#else
+static inline void disable_msi_mode(struct pci_dev *dev, int pos, int type) { }
+#endif
+
 extern int pcie_mch_quirk;
 extern struct device_attribute pci_dev_attrs[];
 extern struct class_device_attribute class_device_attr_cpuaffinity;

--
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/