diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-20 12:18:08 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-20 12:18:08 -0400 |
commit | 2cb7e714229681408e323852bed939989faf6991 (patch) | |
tree | 552b78fa5830a0337594f9fbab5f1dc0306e93cd /drivers/Kconfig | |
parent | d638d4990bfb99998420e78e8fd4607bca5cf8d0 (diff) | |
parent | 3f23de10f283819bcdc0d2282e8b5b14c2e96d3b (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/sfr/ofcons
* 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/sfr/ofcons:
Create drivers/of/platform.c
Create linux/of_platorm.h
[SPARC/64] Rename some functions like PowerPC
Begin consolidation of of_device.h
Begin to consolidate of_device.c
Consolidate of_find_node_by routines
Consolidate of_get_next_child
Consolidate of_get_parent
Consolidate of_find_property
Consolidate of_device_is_compatible
Start split out of common open firmware code
Split out common parts of prom.h
Diffstat (limited to 'drivers/Kconfig')
-rw-r--r-- | drivers/Kconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/Kconfig b/drivers/Kconfig index 707650ab77a7..3e1c442deff9 100644 --- a/drivers/Kconfig +++ b/drivers/Kconfig | |||
@@ -8,6 +8,8 @@ source "drivers/connector/Kconfig" | |||
8 | 8 | ||
9 | source "drivers/mtd/Kconfig" | 9 | source "drivers/mtd/Kconfig" |
10 | 10 | ||
11 | source "drivers/of/Kconfig" | ||
12 | |||
11 | source "drivers/parport/Kconfig" | 13 | source "drivers/parport/Kconfig" |
12 | 14 | ||
13 | source "drivers/pnp/Kconfig" | 15 | source "drivers/pnp/Kconfig" |