diff options
Diffstat (limited to 'arch/unicore32')
-rw-r--r-- | arch/unicore32/Kconfig | 1 | ||||
-rw-r--r-- | arch/unicore32/kernel/pci.c | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/arch/unicore32/Kconfig b/arch/unicore32/Kconfig index 03c9ff808b5a..b0a47433341e 100644 --- a/arch/unicore32/Kconfig +++ b/arch/unicore32/Kconfig | |||
@@ -238,7 +238,6 @@ config I2C_BATTERY_BQ27200 | |||
238 | config I2C_EEPROM_AT24 | 238 | config I2C_EEPROM_AT24 |
239 | tristate "I2C EEPROMs AT24 support" | 239 | tristate "I2C EEPROMs AT24 support" |
240 | select I2C_PUV3 | 240 | select I2C_PUV3 |
241 | select MISC_DEVICES | ||
242 | select EEPROM_AT24 | 241 | select EEPROM_AT24 |
243 | 242 | ||
244 | config LCD_BACKLIGHT | 243 | config LCD_BACKLIGHT |
diff --git a/arch/unicore32/kernel/pci.c b/arch/unicore32/kernel/pci.c index 2fc2b1ba825e..46cb6c9de6c9 100644 --- a/arch/unicore32/kernel/pci.c +++ b/arch/unicore32/kernel/pci.c | |||
@@ -296,7 +296,7 @@ static int __init pci_common_init(void) | |||
296 | } | 296 | } |
297 | subsys_initcall(pci_common_init); | 297 | subsys_initcall(pci_common_init); |
298 | 298 | ||
299 | char * __devinit pcibios_setup(char *str) | 299 | char * __init pcibios_setup(char *str) |
300 | { | 300 | { |
301 | if (!strcmp(str, "debug")) { | 301 | if (!strcmp(str, "debug")) { |
302 | debug_pci = 1; | 302 | debug_pci = 1; |