Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6

Browse source

* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
  [ATA]: Don't allow to enable this for SPARC64 without PCI.
  [VIDEO]: XVR500 and XVR2500 require FB=y

...

This commit is contained in:

Linus Torvalds 2007-06-04 13:25:59 -07:00

parent 78ae87c3cd 899b69d079

commit 4acbab8468

2 changed files with 4 additions and 3 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

1

drivers/ata/Kconfig

View file

6

drivers/video/Kconfig

View file