summaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@home.osdl.org>2003-09-03 20:08:13 -0700
committerLinus Torvalds <torvalds@home.osdl.org>2003-09-03 20:08:13 -0700
commit9028b7b80906bfe5c25132274ff96330e274c9b6 (patch)
tree2a64dec2170ed71c904b50fcd180394c954d4a6a /include/linux
parent1db8f9f9ff0de5ef592ce9419c55ad3a0b4808a6 (diff)
parentfe7696127c27ee596328b96915f38d2b0b5adf8c (diff)
Merge bk://linux-scsi.bkbits.net/scsi-for-linus-2.6
into home.osdl.org:/home/torvalds/v2.5/linux
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/sysctl.h8
1 files changed, 7 insertions, 1 deletions
diff --git a/include/linux/sysctl.h b/include/linux/sysctl.h
index c48edf4a551e..38c43d95a616 100644
--- a/include/linux/sysctl.h
+++ b/include/linux/sysctl.h
@@ -603,7 +603,8 @@ enum {
DEV_HWMON=2,
DEV_PARPORT=3,
DEV_RAID=4,
- DEV_MAC_HID=5
+ DEV_MAC_HID=5,
+ DEV_SCSI=6,
};
/* /proc/sys/dev/cdrom */
@@ -664,6 +665,11 @@ enum {
DEV_MAC_HID_ADB_MOUSE_SENDS_KEYCODES=6
};
+/* /proc/sys/dev/scsi */
+enum {
+ DEV_SCSI_LOGGING_LEVEL=1,
+};
+
/* /proc/sys/abi */
enum
{