Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit cfae35804bcb909225d6f4eb5bd29e25971614d8

Authored by Linus Torvalds
2 parents 56f29d7fe4 51d7513a8a
Exists in master and in 20 other branches dlt-processor-sdk-linux-03.00.00.04, newt-ti-linux-3.12.y, processor-sdk-linux-01.00.00, processor-sdk-linux-02.00.01, smarc-ti-linux-3.12.10, smarc-ti-linux-3.12.y, smarc-ti-linux-3.14.y, smarc-ti-linux-3.15.y, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04, ti-linux-3.12.y, ti-linux-3.14.y, ti-linux-3.15.y, ti-lsk-linux-4.1.y

Merge branch 'block' of git://brick.kernel.dk/data/git/linux-2.6-block 

* 'block' of git://brick.kernel.dk/data/git/linux-2.6-block:
  [PATCH] Only enable CONFIG_BLOCK option for embedded

Showing 1 changed file Side-by-side Diff

... ... @@ -2,7 +2,7 @@
2 2 # Block layer core configuration
3 3 #
4 4 config BLOCK
5   - bool "Enable the block layer"
  5 + bool "Enable the block layer" if EMBEDDED
6 6 default y
7 7 help
8 8 This permits the block layer to be removed from the kernel if it's not