diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2014-02-21 21:36:40 +0100 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2014-02-21 21:37:09 +0100 |
| commit | d97a860c4f3de98ba5040a22f305b7159fe17cff (patch) | |
| tree | 90c2155ec5a1f3115a9eb7a86f25d1a4610227c6 /drivers/char/Kconfig | |
| parent | 3f67d962c64d9b6de9dab81bdbe6d5c94c80d9b9 (diff) | |
| parent | d158fc7f36a25e19791d25a55da5623399a2644f (diff) | |
| download | talos-obmc-linux-d97a860c4f3de98ba5040a22f305b7159fe17cff.tar.gz talos-obmc-linux-d97a860c4f3de98ba5040a22f305b7159fe17cff.zip | |
Merge branch 'linus' into sched/core
Reason: Bring bakc upstream modification to resolve conflicts
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'drivers/char/Kconfig')
| -rw-r--r-- | drivers/char/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig index fa3243d71c76..1386749b48ff 100644 --- a/drivers/char/Kconfig +++ b/drivers/char/Kconfig @@ -499,6 +499,7 @@ config RAW_DRIVER config MAX_RAW_DEVS int "Maximum number of RAW devices to support (1-65536)" depends on RAW_DRIVER + range 1 65536 default "256" help The maximum number of RAW devices that are supported. |
