Commit 51e3d7fb authored by Linus Torvalds's avatar Linus Torvalds

Merge bk://gkernel.bkbits.net/misc-2.6

into ppc970.osdl.org:/home/torvalds/v2.5/linux
parents 065f9b84 84d2b9a7
/*
* carmel.c: Driver for Promise SATA SX8 looks-like-I2O hardware
*
* Copyright 2004 Red Hat, Inc.
*
* Author/maintainer: Jeff Garzik <jgarzik@pobox.com>
*
* This file is subject to the terms and conditions of the GNU General Public
* License. See the file "COPYING" in the main directory of this archive
* for more details.
*/
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/module.h> #include <linux/module.h>
...@@ -21,7 +32,7 @@ ...@@ -21,7 +32,7 @@
MODULE_AUTHOR("Jeff Garzik"); MODULE_AUTHOR("Jeff Garzik");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_DESCRIPTION("Promise SX8 (carmel) block driver"); MODULE_DESCRIPTION("Promise SATA SX8 (carmel) block driver");
#if 0 #if 0
#define CARM_DEBUG #define CARM_DEBUG
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment