VisionFive2 Linux kernel

author: Linus Torvalds <torvalds@linux-foundation.org> 2011-03-21 10:05:22 -0700 committer: Linus Torvalds <torvalds@linux-foundation.org> 2011-03-21 10:05:22 -0700 commit: c3ca48f062a37c2f79560a9b0b9f1b08039aa248 parent: 4e76ae4406449811c0b743ccf0612ef6ffcf2acb

Commit Summary:

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6

Diffstat:

1 file changed, 2 insertions, 1 deletion

diff --git a/drivers/firewire/Kconfig b/drivers/firewire/Kconfig
index 0c56989cd907..2be6f4520772 100644
--- a/drivers/firewire/Kconfig
+++ b/drivers/firewire/Kconfig
@@ -75,7 +75,8 @@ config FIREWIRE_NOSY
 	  The following cards are known to be based on PCILynx or PCILynx-2:
 	  IOI IOI-1394TT (PCI card), Unibrain Fireboard 400 PCI Lynx-2
 	  (PCI card), Newer Technology FireWire 2 Go (CardBus card),
-	  Apple Power Mac G3 blue & white (onboard controller).
+	  Apple Power Mac G3 blue & white and G4 with PCI graphics
+	  (onboard controller).
 
 	  To compile this driver as a module, say M here:  The module will be
 	  called nosy.  Source code of a userspace interface to nosy, called