summaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorJames Bottomley <jejb@raven.il.steeleye.com>2003-09-03 06:53:52 -0500
committerJames Bottomley <jejb@raven.il.steeleye.com>2003-09-03 06:53:52 -0500
commitd7b8d30b898e15572e38bc3c939c9c42cc736be5 (patch)
tree162f875ee3695ab14d5a513c11c59e8ee26b0a50 /include/linux
parent5b8b844d7fd48c369d241cf8e96be00964c45d28 (diff)
parent1932bb09c145e44ed7a92a525d623713599ad768 (diff)
Merge hch/akpm changes
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
{