summaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorJames Bottomley <jejb@raven.il.steeleye.com>2003-09-04 01:46:33 -0500
committerJames Bottomley <jejb@raven.il.steeleye.com>2003-09-04 01:46:33 -0500
commitfe7696127c27ee596328b96915f38d2b0b5adf8c (patch)
tree870d01177327ee2cb799476af05b5f5990f73f1e /include/linux
parent155f364cc3b3b20043c35ec8e2a944cce35f1297 (diff)
parentd613f39085a9d988c1445f3e26ad1fd1f326ab16 (diff)
Merge raven.il.steeleye.com:/home/jejb/BK/scsi-misc-2.5
into raven.il.steeleye.com:/home/jejb/BK/scsi-for-linus-2.6
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
{