diff options
author | Grant Likely <grant.likely@secretlab.ca> | 2011-03-12 01:25:53 -0700 |
---|---|---|
committer | Grant Likely <grant.likely@secretlab.ca> | 2011-03-12 01:25:53 -0700 |
commit | 9c3c8afccb6a163fd2be739f511e863eab668702 (patch) | |
tree | e587a5377ada98fed8cfa6c8ee63125361f2818a /drivers/net/can/mscan/Kconfig | |
parent | 290293eda2c6dd368476d71433bdef07c39a6829 (diff) | |
parent | a5abba989deceb731047425812d268daf7536575 (diff) | |
download | kernel_samsung_smdk4412-9c3c8afccb6a163fd2be739f511e863eab668702.zip kernel_samsung_smdk4412-9c3c8afccb6a163fd2be739f511e863eab668702.tar.gz kernel_samsung_smdk4412-9c3c8afccb6a163fd2be739f511e863eab668702.tar.bz2 |
Merge commit 'v2.6.38-rc8' into spi/next
Conflicts:
drivers/spi/pxa2xx_spi_pci.c
Diffstat (limited to 'drivers/net/can/mscan/Kconfig')
-rw-r--r-- | drivers/net/can/mscan/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/can/mscan/Kconfig b/drivers/net/can/mscan/Kconfig index 27d1d39..d387069 100644 --- a/drivers/net/can/mscan/Kconfig +++ b/drivers/net/can/mscan/Kconfig @@ -1,5 +1,5 @@ config CAN_MSCAN - depends on CAN_DEV && (PPC || M68K || M68KNOMMU) + depends on CAN_DEV && (PPC || M68K) tristate "Support for Freescale MSCAN based chips" ---help--- The Motorola Scalable Controller Area Network (MSCAN) definition |