diff options
| author | David S. Miller <davem@davemloft.net> | 2009-06-15 06:02:23 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-06-15 06:02:23 -0400 |
| commit | 9cbc1cb8cd46ce1f7645b9de249b2ce8460129bb (patch) | |
| tree | 8d104ec2a459346b99413b0b77421ca7b9936c1a /drivers/of | |
| parent | ca44d6e60f9de26281fda203f58b570e1748c015 (diff) | |
| parent | 45e3e1935e2857c54783291107d33323b3ef33c8 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
Documentation/feature-removal-schedule.txt
drivers/scsi/fcoe/fcoe.c
net/core/drop_monitor.c
net/core/net-traces.c
Diffstat (limited to 'drivers/of')
| -rw-r--r-- | drivers/of/Kconfig | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/of/Kconfig b/drivers/of/Kconfig index 6fe043bd3770..d2fa27c5c1b2 100644 --- a/drivers/of/Kconfig +++ b/drivers/of/Kconfig | |||
| @@ -1,22 +1,22 @@ | |||
| 1 | config OF_DEVICE | 1 | config OF_DEVICE |
| 2 | def_bool y | 2 | def_bool y |
| 3 | depends on OF && (SPARC || PPC_OF) | 3 | depends on OF && (SPARC || PPC_OF || MICROBLAZE) |
| 4 | 4 | ||
| 5 | config OF_GPIO | 5 | config OF_GPIO |
| 6 | def_bool y | 6 | def_bool y |
| 7 | depends on OF && PPC_OF && GPIOLIB | 7 | depends on OF && (PPC_OF || MICROBLAZE) && GPIOLIB |
| 8 | help | 8 | help |
| 9 | OpenFirmware GPIO accessors | 9 | OpenFirmware GPIO accessors |
| 10 | 10 | ||
| 11 | config OF_I2C | 11 | config OF_I2C |
| 12 | def_tristate I2C | 12 | def_tristate I2C |
| 13 | depends on PPC_OF && I2C | 13 | depends on (PPC_OF || MICROBLAZE) && I2C |
| 14 | help | 14 | help |
| 15 | OpenFirmware I2C accessors | 15 | OpenFirmware I2C accessors |
| 16 | 16 | ||
| 17 | config OF_SPI | 17 | config OF_SPI |
| 18 | def_tristate SPI | 18 | def_tristate SPI |
| 19 | depends on OF && PPC_OF && SPI | 19 | depends on OF && (PPC_OF || MICROBLAZE) && SPI |
| 20 | help | 20 | help |
| 21 | OpenFirmware SPI accessors | 21 | OpenFirmware SPI accessors |
| 22 | 22 | ||